try macos one more time

This commit is contained in:
loucass003
2026-03-09 18:19:03 +01:00
parent 25a8bd144d
commit d4c53086dc

View File

@@ -98,8 +98,8 @@ jobs:
platform: windows
- os: windows-11-arm
platform: windows
# - os: macos-latest
# platform: macos
- os: macos-latest
platform: macos
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
@@ -123,7 +123,6 @@ jobs:
with:
name: gui-dist
- name: Extract GUI for Electron
# Using bash shell explicitly for cross-platform compatibility
shell: bash
run: mkdir -p gui/out && tar -xzf slimevr-gui-dist.tar.gz -C gui/out
- name: Run Electron Builder
@@ -140,41 +139,33 @@ jobs:
- name: Collect and Rename Artifacts
shell: bash
run: |
# Create the output dir at the workspace root
mkdir -p "$GITHUB_WORKSPACE/release-out"
SRC_DIR="${{ github.workspace }}/gui/dist/artifacts"
DEST_DIR="${{ github.workspace }}/release-out"
mkdir -p "$DEST_DIR"
if [ "${{ matrix.platform }}" == "windows" ]; then
if [[ "${{ matrix.os }}" == *"arm"* ]]; then
FINAL_NAME="SlimeVR-win-aarch64.zip"
else
FINAL_NAME="SlimeVR-win64.zip"
fi
# Use a wildcard to find the exe and copy it to the root release-out
cp gui/dist/artifacts/win/*.exe "$GITHUB_WORKSPACE/release-out/$FINAL_NAME"
[[ "${{ matrix.os }}" == *"arm"* ]] && SUFFIX="win-aarch64" || SUFFIX="win64"
cp "$SRC_DIR"/win/*.exe "$DEST_DIR/SlimeVR-$SUFFIX.zip"
elif [ "${{ matrix.platform }}" == "linux" ]; then
# Navigate to where electron-builder put the files
cd gui/dist/artifacts/linux
for f in *; do
# Skip directories if any exist
for f in "$SRC_DIR"/linux/*; do
# Skip directories (like linux-unpacked)
[ -d "$f" ] && continue
NEW_NAME=$f
# Normalize x86_64 -> amd64 and arm64 -> aarch64
NEW_NAME=${NEW_NAME//x86_64/amd64}
NEW_NAME=${NEW_NAME//arm64/aarch64}
# Get filename only
BASE=$(basename "$f")
# Normalize: x86_64 -> amd64, arm64 -> aarch64
NEW_NAME=$(echo "$BASE" | sed -e 's/x86_64/amd64/g' -e 's/arm64/aarch64/g')
# Copy using the absolute path to the root release-out
cp "$f" "$GITHUB_WORKSPACE/release-out/$NEW_NAME"
cp "$f" "$DEST_DIR/$NEW_NAME"
done
cd "$GITHUB_WORKSPACE"
elif [ "${{ matrix.platform }}" == "macos" ]; then
cp gui/dist/artifacts/mac/*.dmg "$GITHUB_WORKSPACE/release-out/SlimeVR-mac.dmg"
cp "$SRC_DIR"/mac/*.dmg "$DEST_DIR/SlimeVR-mac.dmg"
fi
echo "Final artifacts for ${{ matrix.platform }}:"
ls -lh "$GITHUB_WORKSPACE/release-out/"
echo "Finalized artifacts for ${{ matrix.platform }}:"
ls -lh "$DEST_DIR"
- name: Upload For Release
uses: actions/upload-artifact@v6
with:
@@ -220,7 +211,7 @@ jobs:
create-release:
name: Finalize Release Draft
needs: [package-desktop, bundle-android, build-server-jar, build-gui-frontend]
# if: startsWith(github.ref, 'refs/tags/')
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
steps:
- name: Download All Release Artifacts
@@ -243,11 +234,6 @@ jobs:
tag_name: electron-test
generate_release_notes: true
files: |
*.AppImage
*.deb
*.rpm
*.apk
*.dmg
*.zip
*.jar
*.tar.gz
release-out/*
server/desktop/build/libs/slimevr.jar
slimevr-gui-dist.tar.gz