diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3748ff4b2..9b3e97183 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,9 @@ on: macos_version: type: string required: true + platform: + type: string + required: true jobs: build: @@ -52,18 +55,24 @@ jobs: include: - os: macos-latest platform: macos + if: (${{ inputs.platform == 'desktop' }} || ${{ inputs.platform == 'all' }}) - os: windows-latest platform: windows + if: (${{ inputs.platform == 'desktop' }} || ${{ inputs.platform == 'all' }}) - os: ubuntu-latest-16-cores platform: android target: apk + if: (${{ inputs.platform == 'android' }} || ${{ inputs.platform == 'all' }}) - os: ubuntu-latest-16-cores platform: android target: aab + if: (${{ inputs.platform == 'android' }} || ${{ inputs.platform == 'all' }}) - os: ubuntu-latest platform: linux + if: (${{ inputs.platform == 'desktop' }} || ${{ inputs.platform == 'all' }}) - os: macos-latest platform: ios + if: (${{ inputs.platform == 'ios' }} || ${{ inputs.platform == 'all' }}) runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d02e79a52..5a329de1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,6 +3,8 @@ name: Publish releases on: # Triggers the workflow on push when pushing to a version tag push: + branches: + - ci-android-fix tags: - '*lantern-*' workflow_run: @@ -38,7 +40,7 @@ jobs: echo "Platform determined: android" echo "platform=android" >> "$GITHUB_OUTPUT" elif [[ $TAG == desktop-* ]]; then - echo "Platform determined: macos" + echo "Platform determined: desktop" echo "platform=desktop" >> "$GITHUB_OUTPUT" else echo "Platform determined: all (tag did not match specific platforms)" @@ -50,7 +52,7 @@ jobs: fi set-version: - needs: determine-platform + needs: determine-tag runs-on: ubuntu-latest outputs: version: ${{ steps.set-version.outputs.version }} @@ -115,6 +117,7 @@ jobs: dist-suffix: x64 installer-suffix: -x64 windows-arch: x64 + platform: ${{ needs.determine-platform.outputs.platform }} push-binaries: runs-on: ubuntu-latest