[ci] More M1 work

ossia · Dec 26, 2023 · ecba796 · ecba796
1 parent cbe4f60
commit ecba796
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/mac-builds.yaml b/.github/workflows/mac-builds.yaml
@@ -83,6 +83,9 @@ jobs:
         env:
           MACOS_ARCH: "aarch64"
       - run: |
+          export GITTAGNOV=$(echo "$GITHUB_REF" | sed "s/.*\///;s/^v//")
+          export BUILD_ARTIFACTSTAGINGDIRECTORY=$PWD/staging
+          mkdir $BUILD_ARTIFACTSTAGINGDIRECTORY
           source ci/osx-package.deploy.sh
         env:
           MACOS_ARCH: "aarch64"
@@ -93,4 +96,4 @@ jobs:
         with:
           name: macos-aarch64
           path: |
-            *.dmg
+            staging/*.*
diff --git a/ci/osx-package.deploy.sh b/ci/osx-package.deploy.sh
@@ -70,8 +70,5 @@ xcrun stapler validate ./*.dmg
 [[ $? == 0 ]] || exit 1
 
 # Archive
-if [ -z ${BUILD_ARTIFACTSTAGINGDIRECTORY+x} ]; then
-  BUILD_ARTIFACTSTAGINGDIRECTORY="$PWD"
-fi
 mv ./*.dmg "$BUILD_ARTIFACTSTAGINGDIRECTORY/ossia score-$TAG-macOS.dmg"
 mv "mac-sdk.zip" "$BUILD_ARTIFACTSTAGINGDIRECTORY/"