From 79d7179c72209b0662c840f8eacab1c26aea0eba Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 15 Feb 2024 14:47:20 -0500 Subject: Fix the persistent breakage when cleaning up branches The github workflow that we have set up for branch deletion doesn't work: - the `on: delete` event does not support the `branches:` filter - the `mode` flag for the aws_s3 module does not have `delete` as one of the options. The proper option appears to be `delobj`. --- .github/workflows/feature_branch_deletion.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/feature_branch_deletion.yml b/.github/workflows/feature_branch_deletion.yml index 3fbd287cb1..4893f8267d 100644 --- a/.github/workflows/feature_branch_deletion.yml +++ b/.github/workflows/feature_branch_deletion.yml @@ -2,12 +2,10 @@ name: Feature branch deletion cleanup env: LC_ALL: "C.UTF-8" # prevent ERROR: Ansible could not initialize the preferred locale: unsupported locale setting -on: - delete: - branches: - - feature_** +on: delete jobs: - push: + branch_delete: + if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'feature_') }} runs-on: ubuntu-latest timeout-minutes: 20 permissions: @@ -22,6 +20,4 @@ jobs: run: | ansible localhost -c local, -m command -a "{{ ansible_python_interpreter + ' -m pip install boto3'}}" ansible localhost -c local -m aws_s3 \ - -a "bucket=awx-public-ci-files object=${GITHUB_REF##*/}/schema.json mode=delete permission=public-read" - - + -a "bucket=awx-public-ci-files object=${GITHUB_REF##*/}/schema.json mode=delobj permission=public-read" -- cgit v1.2.3