diff --git a/.github/workflows/generate-test-seed.yml b/.github/workflows/generate-test-seed.yml index 86f5edea..c667a08b 100644 --- a/.github/workflows/generate-test-seed.yml +++ b/.github/workflows/generate-test-seed.yml @@ -2,6 +2,7 @@ name: Generate Test Seed on: pull_request: + types: [opened, synchronize, reopened, labeled] paths: - '.github/workflows/generate-test-seed.yml' - 'seed/seed.json' @@ -10,6 +11,8 @@ on: jobs: build: runs-on: ubuntu-latest + if: github.event.action != 'labeled' || github.event.label.name == 'CI/rebuild' + env: ACTION_RUN_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' BASE_SHA: '${{ github.event.pull_request.base.sha }}' @@ -18,11 +21,23 @@ jobs: SEED_VERSION: 'pull/${{ github.event.pull_request.number }}@${{ github.sha }}' steps: + - name: Remove CI/rebuild label + if: contains(github.event.pull_request.labels.*.name, 'CI/rebuild') + env: + GH_TOKEN: ${{ github.token }} + run: gh pr edit ${{ github.event.pull_request.number }} --repo ${{ github.repository }} --remove-label 'CI/rebuild' + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: Fetch base commit run: git fetch --depth=1 origin "$BASE_SHA" + - name: Rebase on base branch + if: "!contains(github.event.pull_request.labels.*.name, 'CI/no-rebase')" + run: | + git fetch origin "${{ github.event.pull_request.base.sha }}" + git rebase FETCH_HEAD + - name: Setup Python uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5 with: diff --git a/.github/workflows/test-src.yml b/.github/workflows/test-src.yml index 2fb0528a..ea28e031 100644 --- a/.github/workflows/test-src.yml +++ b/.github/workflows/test-src.yml @@ -2,13 +2,22 @@ name: Tracker&Griffin tests on: pull_request: + types: [opened, synchronize, reopened, labeled] merge_group: merge_group: jobs: build: runs-on: ubuntu-latest + if: github.event.action != 'labeled' || github.event.label.name == 'CI/rebuild' + steps: + - name: Remove CI/rebuild label + if: github.event.action == 'labeled' && github.event.label.name == 'CI/rebuild' + env: + GH_TOKEN: ${{ github.token }} + run: gh pr edit ${{ github.event.pull_request.number }} --remove-label 'CI/rebuild' + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - name: npm install diff --git a/seed/seed.json b/seed/seed.json index 5a68619b..c9fbff77 100644 --- a/seed/seed.json +++ b/seed/seed.json @@ -2950,5 +2950,5 @@ "name": "BraveWebcompatExceptionsServiceReleaseStudy" } ], - "version": "1" + "version": "2" }