Compare commits

..

7 Commits

Author SHA1 Message Date
William Bell
677afd9433 fix using Rosetta 2025-08-16 04:10:57 +01:00
William Bell
757da3f973 stupid ai 2025-08-16 03:51:05 +01:00
William Bell
5a86510c3b fix release for macos x86_64 and arm64 2025-08-16 03:48:48 +01:00
William Bell
fb8b6a89ae build for more architectures 2025-08-16 03:41:32 +01:00
William Bell
6ddf9953e7 change windows builds to tar.gz 2025-08-16 03:23:01 +01:00
William Bell
1609227a42 add bcrypt for windows 2025-08-16 03:10:50 +01:00
William Bell
51f6a88ce8 add profile to build 2025-08-16 03:00:01 +01:00
2 changed files with 35 additions and 15 deletions

View File

@@ -56,6 +56,9 @@ jobs:
build-macos: build-macos:
runs-on: macos-latest runs-on: macos-latest
strategy:
matrix:
arch: [x86_64, arm64] # build both architectures
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@@ -77,14 +80,30 @@ jobs:
- name: Build - name: Build
run: | run: |
conan install . --build=missing BUILD_DIR="build_${{ matrix.arch }}"
conan build . mkdir -p "$BUILD_DIR"
cd "$BUILD_DIR"
# Use Rosetta for x86_64 builds on Apple Silicon
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
arch -x86_64 bash -c "
export CMAKE_OSX_ARCHITECTURES=x86_64
conan install .. --build=missing
conan build ..
"
else
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
conan install .. --build=missing
conan build ..
fi
cd ..
- name: Package - name: Package
run: | run: |
TAG=${GITHUB_REF##refs/tags/} TAG=${GITHUB_REF##refs/tags/}
OS=$(uname -s | tr '[:upper:]' '[:lower:]') OS="macos"
ARCH=$(uname -m) ARCH="${{ matrix.arch }}"
FOLDER="chloride-$TAG-$OS-$ARCH" FOLDER="chloride-$TAG-$OS-$ARCH"
TAR="$FOLDER.tar.gz" TAR="$FOLDER.tar.gz"
mv build/bin "$FOLDER" mv build/bin "$FOLDER"
@@ -95,7 +114,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: macos-artifact name: macos-${{ matrix.arch }}-artifact
path: ${{ env.TAR_NAME }} path: ${{ env.TAR_NAME }}
build-windows: build-windows:
@@ -131,19 +150,19 @@ jobs:
- name: Build Project - name: Build Project
run: | run: |
conan install . --profile mingw-profile.txt --build=missing conan install . --profile mingw-profile.txt --build=missing
conan build . conan build . --profile mingw-profile.txt
- name: Package - name: Package
run: | run: |
$TAG = $env:GITHUB_REF -replace 'refs/tags/', '' TAG=${GITHUB_REF##refs/tags/}
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' } OS="windows"
$FOLDER = "chloride-$TAG-windows-$ARCH" ARCH=$(uname -m)
$ZIP = "$FOLDER.zip" FOLDER="chloride-$TAG-$OS-$ARCH"
Rename-Item build/bin $FOLDER TAR="$FOLDER.tar.gz"
Copy-Item LICENSE.txt $FOLDER mv build/bin "$FOLDER"
Compress-Archive -Path $FOLDER -DestinationPath $ZIP cp LICENSE.txt "$FOLDER"
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV tar -czf "$TAR" "$FOLDER"
shell: pwsh echo "TAR_NAME=$TAR" >> $GITHUB_ENV
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View File

@@ -57,6 +57,7 @@ target_link_libraries(argon PRIVATE
BDWgc::BDWgc BDWgc::BDWgc
gmp::gmp gmp::gmp
m m
$<$<PLATFORM_ID:Windows>:bcrypt>
) )
target_include_directories(argon PRIVATE target_include_directories(argon PRIVATE