diff --git a/.github/workflows/_repo-owns-branch.yml b/.github/workflows/_repo-owns-branch.yml deleted file mode 100644 index 8d58b29997..0000000000 --- a/.github/workflows/_repo-owns-branch.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -name: Repo Owns Branch - -# Reusable workflow that determines whether the current repository -# owns the current branch for push operations. -# -# Ownership rules: -# - ansible/awx owns: devel, feature_* -# - ansible/tower owns: stable-*, release_* -# - workflow_dispatch is always allowed -# -# All other repo/branch combinations are skipped. - -on: - workflow_call: - outputs: - should_run: - description: Whether this repo owns the current branch - value: ${{ jobs.check.outputs.should_run }} - -jobs: - check: - runs-on: ubuntu-latest - outputs: - should_run: ${{ steps.check.outputs.should_run }} - steps: - - name: Check branch ownership - id: check - run: | - REPO="${{ github.repository }}" - BRANCH="${{ github.ref_name }}" - EVENT="${{ github.event_name }}" - - if [[ "$EVENT" == "workflow_dispatch" ]]; then - echo "should_run=true" >> $GITHUB_OUTPUT - echo "Manual trigger — allowed" - exit 0 - fi - - # ansible/awx owns devel and feature_* branches - if [[ "$REPO" == "ansible/awx" ]] && [[ "$BRANCH" == "devel" || "$BRANCH" == feature_* ]]; then - echo "should_run=true" >> $GITHUB_OUTPUT - echo "Repository '$REPO' owns branch '$BRANCH'" - exit 0 - fi - - # ansible/tower owns stable-* and release_* branches - if [[ "$REPO" == "ansible/tower" ]] && [[ "$BRANCH" == stable-* || "$BRANCH" == release_* ]]; then - echo "should_run=true" >> $GITHUB_OUTPUT - echo "Repository '$REPO' owns branch '$BRANCH'" - exit 0 - fi - - echo "should_run=false" >> $GITHUB_OUTPUT - echo "Repository '$REPO' does not own branch '$BRANCH' — skipping" diff --git a/.github/workflows/devel_images.yml b/.github/workflows/devel_images.yml index 5cacb23ee0..544ef8912b 100644 --- a/.github/workflows/devel_images.yml +++ b/.github/workflows/devel_images.yml @@ -12,12 +12,11 @@ on: - feature_* - stable-* jobs: - check-ownership: - uses: ./.github/workflows/_repo-owns-branch.yml - push-development-images: - needs: check-ownership - if: needs.check-ownership.outputs.should_run == 'true' + if: | + github.event_name == 'workflow_dispatch' || + (github.repository == 'ansible/awx' && (github.ref_name == 'devel' || startsWith(github.ref_name, 'feature_'))) || + (github.repository == 'ansible/tower' && (startsWith(github.ref_name, 'stable-') || startsWith(github.ref_name, 'release_'))) runs-on: ubuntu-latest timeout-minutes: 120 permissions: diff --git a/.github/workflows/spec-sync-on-merge.yml b/.github/workflows/spec-sync-on-merge.yml index 9dbc330e1b..c21d03e6bc 100644 --- a/.github/workflows/spec-sync-on-merge.yml +++ b/.github/workflows/spec-sync-on-merge.yml @@ -20,12 +20,11 @@ on: - 'stable-2.[1-9][0-9]' workflow_dispatch: # Allow manual triggering for testing jobs: - check-ownership: - uses: ./.github/workflows/_repo-owns-branch.yml - sync-openapi-spec: - needs: check-ownership - if: needs.check-ownership.outputs.should_run == 'true' + if: | + github.event_name == 'workflow_dispatch' || + (github.repository == 'ansible/awx' && (github.ref_name == 'devel' || startsWith(github.ref_name, 'feature_'))) || + (github.repository == 'ansible/tower' && (startsWith(github.ref_name, 'stable-') || startsWith(github.ref_name, 'release_'))) name: Sync OpenAPI spec to central repo runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/upload_schema.yml b/.github/workflows/upload_schema.yml index 9f4c4d7ddb..ad202cae74 100644 --- a/.github/workflows/upload_schema.yml +++ b/.github/workflows/upload_schema.yml @@ -13,12 +13,11 @@ on: - feature_** - stable-** jobs: - check-ownership: - uses: ./.github/workflows/_repo-owns-branch.yml - push: - needs: check-ownership - if: needs.check-ownership.outputs.should_run == 'true' + if: | + github.event_name == 'workflow_dispatch' || + (github.repository == 'ansible/awx' && (github.ref_name == 'devel' || startsWith(github.ref_name, 'feature_'))) || + (github.repository == 'ansible/tower' && (startsWith(github.ref_name, 'stable-') || startsWith(github.ref_name, 'release_'))) runs-on: ubuntu-latest timeout-minutes: 60 permissions: