diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml index 25ee939c9..5ea3d8f90 100644 --- a/.github/workflows/check-candidate-release.yml +++ b/.github/workflows/check-candidate-release.yml @@ -31,4 +31,4 @@ jobs: secrets: inherit needs: [check_candidates] with: - release_candidate: 'true' + release_candidate: true diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 6a08b46e2..a16fe9dd4 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -6,13 +6,15 @@ on: release_candidate: description: 'Set to true to sync release candidates' required: false - default: 'false' + type: boolean + default: false permissions: contents: write jobs: check_candidates: + name: Sync Upstream runs-on: ubuntu-latest steps: @@ -38,6 +40,17 @@ jobs: if: steps.check-upstream-branch.outputs.branch_exists == 'false' run: npm ci + - name: Setup surfer CI + if: steps.check-upstream-branch.outputs.branch_exists == 'false' + run: | + if [ "${{ github.event.inputs.release_candidate }}" = "false" ]; then + npm run surfer -- ci --brand release + fi + + - name: Download Firefox and dependencies + if: steps.check-upstream-branch.outputs.branch_exists == 'false' + run: npm run download + - name: Sync Upstream Releases if: steps.check-upstream-branch.outputs.branch_exists == 'false' run: |