diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index 79ba15cd54..6b94fd9317 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -424,12 +424,10 @@ jobs: if: >- ${{ always() && - inputs.desktop_macos && - inputs.desktop_linux && - inputs.desktop_windows && + (inputs.desktop_macos || inputs.desktop_linux || inputs.desktop_windows) && needs.before-make.result == 'success' && - needs.make-distribution-macos.result == 'success' && - needs.make-distribution-linux.result == 'success' && + (!inputs.desktop_macos || needs.make-distribution-macos.result == 'success') && + (!inputs.desktop_linux || needs.make-distribution-linux.result == 'success') && ( !inputs.require-windows-signing || ( @@ -457,11 +455,13 @@ jobs: steps: - uses: actions/checkout@v6 - name: Download Artifacts (macos-x64) + if: ${{ inputs.desktop_macos }} uses: actions/download-artifact@v4 with: name: affine-darwin-x64-builds path: ./release - name: Download Artifacts (macos-arm64) + if: ${{ inputs.desktop_macos }} uses: actions/download-artifact@v4 with: name: affine-darwin-arm64-builds @@ -479,6 +479,7 @@ jobs: name: affine-win32-arm64-builds path: ./release - name: Download Artifacts (linux-x64) + if: ${{ inputs.desktop_linux }} uses: actions/download-artifact@v4 with: name: affine-linux-x64-builds diff --git a/.github/workflows/release-mobile.yml b/.github/workflows/release-mobile.yml index a5f562f53f..bc197221ec 100644 --- a/.github/workflows/release-mobile.yml +++ b/.github/workflows/release-mobile.yml @@ -109,6 +109,9 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: 26.2 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' - name: Install Swiftformat run: brew install swiftformat - name: Cap sync @@ -131,8 +134,10 @@ jobs: printf '%s' "$BUILD_PROVISION_PROFILE" | base64 --decode -o "$PP_PATH" mkdir -p "$HOME/Library/MobileDevice/Provisioning Profiles" cp "$PP_PATH" "$HOME/Library/MobileDevice/Provisioning Profiles" - fastlane beta + bundle install + bundle exec fastlane beta env: + BUNDLE_PATH: vendor/bundle BUILD_TARGET: distribution BUILD_PROVISION_PROFILE: ${{ secrets.BUILD_PROVISION_PROFILE }} PP_PATH: ${{ runner.temp }}/build_pp.mobileprovision diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec6c36eda9..27a5230969 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -195,7 +195,7 @@ jobs: desktop_macos: ${{ github.event_name != 'workflow_dispatch' || inputs.desktop_macos }} desktop_windows: ${{ github.event_name != 'workflow_dispatch' || inputs.desktop_windows }} desktop_linux: ${{ github.event_name != 'workflow_dispatch' || inputs.desktop_linux }} - require-windows-signing: ${{ needs.prepare.outputs.BUILD_TYPE == 'beta' || needs.prepare.outputs.BUILD_TYPE == 'stable' || (github.event_name == 'workflow_dispatch' && inputs.desktop_windows) }} + require-windows-signing: ${{ needs.prepare.outputs.BUILD_TYPE == 'stable' || (github.event_name == 'workflow_dispatch' && inputs.desktop_windows) }} mobile: name: Release Mobile diff --git a/packages/frontend/apps/ios/App/Gemfile b/packages/frontend/apps/ios/App/Gemfile index 7a118b49be..3ecd2d03cd 100644 --- a/packages/frontend/apps/ios/App/Gemfile +++ b/packages/frontend/apps/ios/App/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "fastlane" +gem "fastlane", ">= 2.236.1", "< 3.0"