Compare commits
3 Commits
prerelease
...
release-v4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b905026010 | ||
|
|
677afd9433 | ||
|
|
757da3f973 |
26
.github/workflows/release.yml
vendored
26
.github/workflows/release.yml
vendored
@@ -76,7 +76,11 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python -m pip install --upgrade pip
|
||||||
pip install conan
|
pip install conan
|
||||||
conan profile detect
|
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
|
||||||
|
arch -x86_64 conan profile detect
|
||||||
|
else
|
||||||
|
conan profile detect
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
@@ -84,12 +88,18 @@ jobs:
|
|||||||
mkdir -p "$BUILD_DIR"
|
mkdir -p "$BUILD_DIR"
|
||||||
cd "$BUILD_DIR"
|
cd "$BUILD_DIR"
|
||||||
|
|
||||||
# Pass architecture explicitly to CMake via environment
|
# Use Rosetta for x86_64 builds on Apple Silicon
|
||||||
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
|
if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
|
||||||
|
arch -x86_64 bash -c "
|
||||||
# Run Conan install/build
|
export CMAKE_OSX_ARCHITECTURES=x86_64
|
||||||
conan install .. --build=missing
|
conan install .. --build=missing
|
||||||
conan build ..
|
conan build ..
|
||||||
|
"
|
||||||
|
else
|
||||||
|
export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
|
||||||
|
conan install .. --build=missing
|
||||||
|
conan build ..
|
||||||
|
fi
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
@@ -100,7 +110,7 @@ jobs:
|
|||||||
ARCH="${{ matrix.arch }}"
|
ARCH="${{ matrix.arch }}"
|
||||||
FOLDER="chloride-$TAG-$OS-$ARCH"
|
FOLDER="chloride-$TAG-$OS-$ARCH"
|
||||||
TAR="$FOLDER.tar.gz"
|
TAR="$FOLDER.tar.gz"
|
||||||
mv build_${ARCH}/bin "$FOLDER"
|
mv build/bin "$FOLDER"
|
||||||
cp LICENSE.txt "$FOLDER"
|
cp LICENSE.txt "$FOLDER"
|
||||||
tar -czf "$TAR" "$FOLDER"
|
tar -czf "$TAR" "$FOLDER"
|
||||||
echo "TAR_NAME=$TAR" >> $GITHUB_ENV
|
echo "TAR_NAME=$TAR" >> $GITHUB_ENV
|
||||||
|
|||||||
Reference in New Issue
Block a user