rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-17 02:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix directory structure

Browse Source
This commit is contained in:
Alek Westover
2023-07-11 13:52:19 -04:00
parent 13fa5285af
commit f37980a026
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -956,28 +956,27 @@ jobs:
- name: Extract postgres-extensions from container
run: |
rm -rf ./extensions-to-upload ./control_files # Just in case
mkdir extensions-to-upload
rm -rf ./extensions ./control_files # Just in case
mkdir extensions
mkdir control_files
# TODO: Delete Neon extensitons (they always present on compute-node image)
# rm -rf ./extensions-to-upload/share/extension/neon*
# rm -rf ./extensions-to-upload/lib/neon*
# rm -rf ./extensions/share/extension/neon*
# rm -rf ./extensions/lib/neon*
# # TODO: Delete leftovers from the extension build step
# # (This step, if desired, should be moved to Dockerfile.compute-node before the files are zipped)
# rm -rf ./extensions-to-upload/lib/pgxs
# rm -rf ./extensions-to-upload/lib/pkgconfig
# rm -rf ./extensions/lib/pgxs
# rm -rf ./extensions/lib/pkgconfig
docker cp ${{ steps.create-container.outputs.EID }}:/extensions ./extensions-to-upload
docker cp ${{ steps.create-container.outputs.EID }}:/control_files ./control_files
docker cp ${{ steps.create-container.outputs.EID }}:/ ./
poetry run python3 ./scripts/combine_control_files.py
- name: Upload postgres-extensions to S3
run: |
for BUCKET in $(echo ${S3_BUCKETS}); do
aws s3 cp --recursive --only-show-errors ./extensions-to-upload s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
aws s3 cp --only-show-errors ./control_files/control_index.json s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
aws s3 cp --recursive --only-show-errors ./extensions s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
aws s3 cp --only-show-errors ./control_files/ext_index.json s3://${BUCKET}/${{ needs.tag.outputs.build-tag }}/${{ matrix.version }}
done
- name: Cleanup

10
scripts/combine_control_files.py
View File

@@ -1,14 +1,16 @@
import json
import os
index = {}
ext_index = {}
os.chdir("control_files")
for prefix in os.listdir("."):
ext_index[prefix] = {}
for file in os.listdir(prefix):
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}
ext_index[prefix][ext_name] = {"path": f"extensions/{prefix}/{ext_name}.tar.gz", "control": control}
with open("../ext_index.json", "w") as f:
json.dump(ext_index, f)
with open("../control_index.json", "w") as f:
json.dump(index, f)