From aa31185b35313b5f33438e5d676501ddf3e092bc Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Sun, 21 Apr 2024 11:23:18 +0300 Subject: [PATCH] Update release workflow --- .github/workflows/release.yml | 89 +++++++++++++++++++---------------- CMakeLists.txt | 7 --- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f86dc57..ccedbe00 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,17 +17,17 @@ jobs: steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 11 cache: gradle - name: Cache cmake build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: os/android/app/.cxx key: android-cmake-v1 @@ -51,7 +51,7 @@ jobs: run: | cd os/android/app/build/outputs/apk/release cp app-release.apk fallout2-ce-android.apk - gh release upload ${{ github.ref_name }} fallout2-ce-android.apk + gh release upload ${{ github.event.release.tag_name }} fallout2-ce-android.apk rm fallout2-ce-android.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -59,14 +59,14 @@ jobs: ios: name: iOS - runs-on: macos-11 + runs-on: macos-12 steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache cmake build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: build key: ios-cmake-v1 @@ -75,25 +75,31 @@ jobs: run: | cmake \ -B build \ - -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/ios.toolchain.cmake \ -D ENABLE_BITCODE=0 \ -D PLATFORM=OS64 \ + -G Xcode \ + -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY='' \ # EOL - name: Build run: | cmake \ --build build \ + --config RelWithDebInfo \ -j $(sysctl -n hw.physicalcpu) \ - --target package \ # EOL + - name: Pack + run: | + cd build + cpack -C RelWithDebInfo + - name: Upload run: | cd build - cp fallout2-ce.zip fallout2-ce-ios.ipa - gh release upload ${{ github.ref_name }} fallout2-ce-ios.ipa + cp fallout2-ce.ipa fallout2-ce-ios.ipa + gh release upload ${{ github.event.release.tag_name }} fallout2-ce-ios.ipa rm fallout2-ce-ios.ipa env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -112,7 +118,7 @@ jobs: steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Dependencies (x86) if: matrix.arch == 'x86' @@ -129,7 +135,7 @@ jobs: sudo apt install libsdl2-dev zlib1g-dev - name: Cache cmake build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: build key: linux-${{ matrix.arch }}-cmake-v1 @@ -162,7 +168,7 @@ jobs: run: | cd build tar -czvf fallout2-ce-linux-${{ matrix.arch }}.tar.gz fallout2-ce - gh release upload ${{ github.ref_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz + gh release upload ${{ github.event.release.tag_name }} fallout2-ce-linux-${{ matrix.arch }}.tar.gz rm fallout2-ce-linux-${{ matrix.arch }}.tar.gz env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -174,16 +180,16 @@ jobs: steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Import code signing certificates - uses: apple-actions/import-codesign-certs@v1 + uses: apple-actions/import-codesign-certs@v2 with: p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_FILE_BASE64 }} p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_PASSWORD }} - name: Cache cmake build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: build key: macos-cmake-v3 @@ -192,41 +198,44 @@ jobs: run: | cmake \ -B build \ - -D CMAKE_BUILD_TYPE=RelWithDebInfo \ - -D CPACK_BUNDLE_APPLE_CERT_APP="${{ secrets.APPLE_DEVELOPER_CERTIFICATE_IDENTITY }}" \ + -G Xcode \ + -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="${{ secrets.APPLE_DEVELOPER_CERTIFICATE_IDENTITY }}" \ + -D CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_INJECT_BASE_ENTITLEMENTS="NO" \ + -D CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS="--options=runtime --timestamp" \ # EOL - name: Build run: | cmake \ --build build \ + --config RelWithDebInfo \ -j $(sysctl -n hw.physicalcpu) \ - --target package \ # EOL + - name: Pack + run: | + cd build + cpack -C RelWithDebInfo + - name: Notarize run: | - brew install mitchellh/gon/gon - cat << EOF > config.json - { - "notarize": { - "path": "build/fallout2-ce.dmg", - "bundle_id": "$(/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" build/fallout2-ce.app/Contents/Info.plist)", - "staple": true - } - } - EOF - gon config.json - rm config.json - env: - AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_AC_USERNAME }} - AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_AC_PASSWORD }} + xcrun notarytool submit \ + "build/Fallout II Community Edition.dmg" \ + --apple-id "${{ secrets.APPLE_DEVELOPER_AC_USERNAME }}" \ + --team-id "${{ secrets.APPLE_DEVELOPER_AC_TEAM }}" \ + --password "${{ secrets.APPLE_DEVELOPER_AC_PASSWORD }}" \ + --wait + + - name: Staple + run: | + xcrun stapler staple \ + "build/Fallout II Community Edition.dmg" - name: Upload run: | cd build - cp fallout2-ce.dmg fallout2-ce-macos.dmg - gh release upload ${{ github.ref_name }} fallout2-ce-macos.dmg + cp "Fallout II Community Edition.dmg" fallout2-ce-macos.dmg + gh release upload ${{ github.event.release.tag_name }} fallout2-ce-macos.dmg rm fallout2-ce-macos.dmg env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -247,10 +256,10 @@ jobs: steps: - name: Clone - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cache cmake build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: build key: windows-${{ matrix.arch }}-cmake-v1 @@ -274,7 +283,7 @@ jobs: run: | cd build/RelWithDebInfo 7z a fallout2-ce-windows-${{ matrix.arch }}.zip fallout2-ce.exe - gh release upload ${{ github.ref_name }} fallout2-ce-windows-${{ matrix.arch }}.zip + gh release upload ${{ github.event.release.tag_name }} fallout2-ce-windows-${{ matrix.arch }}.zip rm fallout2-ce-windows-${{ matrix.arch }}.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index d2b19cbb..a0d04cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,13 +389,6 @@ if(APPLE) else() install(TARGETS ${EXECUTABLE_NAME} DESTINATION .) - if(CPACK_BUNDLE_APPLE_CERT_APP) - install(CODE " - execute_process(COMMAND codesign --deep --force --options runtime --sign \"${CPACK_BUNDLE_APPLE_CERT_APP}\" ${CMAKE_BINARY_DIR}/Fallout II Community Edition.app) - " - COMPONENT Runtime) - endif() - set(CPACK_GENERATOR "DragNDrop") set(CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK ON) set(CPACK_PACKAGE_FILE_NAME "Fallout II Community Edition")