rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-15 09:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zip_ext' of github.com:neondatabase/neon into zip_ext

Browse Source
This commit is contained in:
Alek Westover
2023-07-11 10:46:40 -04:00
parent 005e9eee3c fdcbadd552
commit de8b914bfe
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_and_test.yml vendored
View File

@@ -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

6
scripts/combine_control_files.py
View File

@@ -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)