diff --git a/.github/workflows/mac-universal.yml b/.github/workflows/mac-universal.yml index 269e61186..990934e1b 100644 --- a/.github/workflows/mac-universal.yml +++ b/.github/workflows/mac-universal.yml @@ -41,7 +41,6 @@ jobs: # Codesigning is handled by the universal workflow! - name: Codesign and notarize run: 'NOTARIZE="no" ./github/workflows/scripts/mac/sign-apps.sh' - if: ${{ matrix.os.name == 'macos' }} - name: 'Tar files' run: 'tar -cvf cboe-macos-universal-${{matrix.configuration}}.tar "build/Blades of Exile"' diff --git a/.github/workflows/scripts/mac/make-universal.sh b/.github/workflows/scripts/mac/make-universal.sh index 8c32ee350..3f6f7edef 100755 --- a/.github/workflows/scripts/mac/make-universal.sh +++ b/.github/workflows/scripts/mac/make-universal.sh @@ -7,11 +7,9 @@ fi INTEL=cboe-macos-intel-$CONFIGURATION SILICON=cboe-macos-silicon-$CONFIGURATION -mkdir "build/Blades of Exile" - combine() { mkdir -p "build/Blades of Exile/$1.app/Contents/MacOS" - lipo -create "$SILICON/Blades of Exile/$1.app/Contents/MacOS/$1" "$INTEL/Blades of Exile/$1.app/Contents/MacOS/$1" -output "build/Blades of Exile/$1.app/Contents/MacOS" + lipo -create "$SILICON/Blades of Exile/$1.app/Contents/MacOS/$1" "$INTEL/Blades of Exile/$1.app/Contents/MacOS/$1" -output "build/Blades of Exile/$1.app/Contents/MacOS/$1" cp -r "$SILICON/Blades of Exile/$1.app/Contents/Frameworks" "build/Blades of Exile/$1.app/Contents/" cp -r "$SILICON/Blades of Exile/$1.app/Contents/Resources" "build/Blades of Exile/$1.app/Contents/" cp "$SILICON/Blades of Exile/$1.app/Contents/Info.plist" "build/Blades of Exile/$1.app/Contents/"