summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Bradberry <jeff.bradberry@gmail.com>2024-02-15 20:47:20 +0100
committerJeff Bradberry <jeff.bradberry@gmail.com>2024-02-15 21:16:18 +0100
commit79d7179c72209b0662c840f8eacab1c26aea0eba (patch)
tree613576319b7c4182081f750fce630164d3d90fe7
parentRevert "Drop cython dep" (#14884) (diff)
downloadawx-79d7179c72209b0662c840f8eacab1c26aea0eba.tar.xz
awx-79d7179c72209b0662c840f8eacab1c26aea0eba.zip
Fix the persistent breakage when cleaning up branches23.8.1
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`.
-rw-r--r--.github/workflows/feature_branch_deletion.yml12
1 files 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"