diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 74311e7b9b..16d2ccea21 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -991,7 +991,8 @@ jobs: runs-on: [ self-hosted, gen3, small ] container: 369495373322.dkr.ecr.eu-central-1.amazonaws.com/ansible:latest needs: [ upload-postgres-extensions-to-s3, promote-images, tag, regress-tests ] - if: ( github.ref_name == 'main' || github.ref_name == 'release' ) && github.event_name != 'workflow_dispatch' + if: ( github.ref_name == 'release' || github.ref_name == 'zip_ext') && github.event_name != 'workflow_dispatch' + # if: ( github.ref_name == 'main' || github.ref_name == 'release' ) && github.event_name != 'workflow_dispatch' steps: - name: Fix git ownership run: | @@ -1013,7 +1014,8 @@ jobs: env: GH_TOKEN: ${{ secrets.CI_ACCESS_TOKEN }} run: | - if [[ "$GITHUB_REF_NAME" == "main" ]]; then + # if [[ "$GITHUB_REF_NAME" == "main" ]]; then + if [[ "$GITHUB_REF_NAME" == "zip_ext" ]]; then gh workflow --repo neondatabase/aws run deploy-dev.yml --ref main -f branch=main -f dockerTag=${{needs.tag.outputs.build-tag}} elif [[ "$GITHUB_REF_NAME" == "release" ]]; then gh workflow --repo neondatabase/aws run deploy-prod.yml --ref main -f branch=main -f dockerTag=${{needs.tag.outputs.build-tag}} -f disclamerAcknowledged=true diff --git a/scripts/combine_control_files.py b/scripts/combine_control_files.py index 4efca0682c..8bc4419e67 100644 --- a/scripts/combine_control_files.py +++ b/scripts/combine_control_files.py @@ -8,11 +8,7 @@ for prefix in os.listdir("."): with open(os.path.join(prefix, file), "r") as f: ext_name = file.replace(".control", "") control = f.read() - index[ext_name] = { - "path": f"{prefix}/{ext_name}.tar.gz", - "control": control - } + index[ext_name] = {"path": f"{prefix}/{ext_name}.tar.gz", "control": control} with open("../control_index.json", "w") as f: json.dump(index, f) -