diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8a2d99d..a203bee9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: [master, develop] pull_request: - workflow_call: concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index cdf32758..b601330d 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -5,18 +5,13 @@ name: Mirror to git.mysociety.org on: - push: + workflow_run: + workflows: [CI, RuboCop] + types: + - completed jobs: - - ci: - uses: ./.github/workflows/ci.yml - - rubocop: - uses: ./.github/workflows/rubocop.yml - mirror: - needs: [ci, rubocop] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 6c1ca8ce..2bf6ad15 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -1,6 +1,7 @@ name: RuboCop -on: [pull_request, workflow_call] +on: + pull_request: permissions: contents: read