From c22fa9e2e7c4c169c621c594606bfeb5b9767ece Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Thu, 5 Dec 2024 17:49:19 +0100 Subject: [PATCH 1/6] ci(feat): add parent images workflows --- .github/workflows/pi_build.yml | 17 +++++++++++++++++ .github/workflows/pi_smodules_merge.yml | 17 +++++++++++++++++ requirements/common-requirements.in | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pi_build.yml create mode 100644 .github/workflows/pi_smodules_merge.yml diff --git a/.github/workflows/pi_build.yml b/.github/workflows/pi_build.yml new file mode 100644 index 0000000..2baa8c4 --- /dev/null +++ b/.github/workflows/pi_build.yml @@ -0,0 +1,17 @@ +name: 'Parent Images: Build' + +on: + workflow_dispatch: + + pull_request: + types: [opened, synchronize, reopened] + +permissions: + id-token: write + contents: write + actions: read + +jobs: + call-pi-build: + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_build.yml@parent-images + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pi_smodules_merge.yml b/.github/workflows/pi_smodules_merge.yml new file mode 100644 index 0000000..060683a --- /dev/null +++ b/.github/workflows/pi_smodules_merge.yml @@ -0,0 +1,17 @@ +name: 'Parent Images: Submodules Merge' + +on: + workflow_dispatch: + + pull_request: + types: [closed] + +permissions: + id-token: write + contents: write + actions: read + +jobs: + call-pi-smodules-merge: + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_smodules_merge.yml@parent-images + secrets: inherit \ No newline at end of file diff --git a/requirements/common-requirements.in b/requirements/common-requirements.in index d86f346..943c102 100644 --- a/requirements/common-requirements.in +++ b/requirements/common-requirements.in @@ -1,7 +1,7 @@ -r mini-requirements.in boto3==1.25.0 minio==7.1.12 -numpy==1.23.4 +numpy==1.23.5 pandas==1.5.1 psycopg2-binary==2.9.9 SQLAlchemy==1.4.42 \ No newline at end of file From 65748caf1147c017c005984b754257d7732765bf Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Fri, 6 Dec 2024 02:52:24 +0100 Subject: [PATCH 2/6] ci: rename pi_merge --- .github/workflows/pi_build.yml | 2 +- .github/workflows/{pi_smodules_merge.yml => pi_merge.yml} | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename .github/workflows/{pi_smodules_merge.yml => pi_merge.yml} (81%) diff --git a/.github/workflows/pi_build.yml b/.github/workflows/pi_build.yml index 2baa8c4..d55219c 100644 --- a/.github/workflows/pi_build.yml +++ b/.github/workflows/pi_build.yml @@ -13,5 +13,5 @@ permissions: jobs: call-pi-build: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_build.yml@parent-images + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_build.yml@dev secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pi_smodules_merge.yml b/.github/workflows/pi_merge.yml similarity index 81% rename from .github/workflows/pi_smodules_merge.yml rename to .github/workflows/pi_merge.yml index 060683a..042b35f 100644 --- a/.github/workflows/pi_smodules_merge.yml +++ b/.github/workflows/pi_merge.yml @@ -13,5 +13,6 @@ permissions: jobs: call-pi-smodules-merge: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_smodules_merge.yml@parent-images + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge.yml@dev + if: ${{ github.event.pull_request.merged }} secrets: inherit \ No newline at end of file From c5b4c104b7a53000a7ea586c273748132e349679 Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Fri, 6 Dec 2024 14:40:53 +0100 Subject: [PATCH 3/6] perf: separate merge into submodule merge --- .github/workflows/{pi_merge.yml => pi_merge_submodule.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{pi_merge.yml => pi_merge_submodule.yml} (85%) diff --git a/.github/workflows/pi_merge.yml b/.github/workflows/pi_merge_submodule.yml similarity index 85% rename from .github/workflows/pi_merge.yml rename to .github/workflows/pi_merge_submodule.yml index 042b35f..93fb50c 100644 --- a/.github/workflows/pi_merge.yml +++ b/.github/workflows/pi_merge_submodule.yml @@ -12,7 +12,7 @@ permissions: actions: read jobs: - call-pi-smodules-merge: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge.yml@dev + call-pi-merge-submodule: + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_submodule.yml@dev if: ${{ github.event.pull_request.merged }} secrets: inherit \ No newline at end of file From 9f3c933ee868f3479390659c9421215e577b4bad Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Fri, 6 Dec 2024 14:43:40 +0100 Subject: [PATCH 4/6] perf: rename pi_merge workflow --- .github/workflows/{pi_merge_submodule.yml => pi_merge.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{pi_merge_submodule.yml => pi_merge.yml} (100%) diff --git a/.github/workflows/pi_merge_submodule.yml b/.github/workflows/pi_merge.yml similarity index 100% rename from .github/workflows/pi_merge_submodule.yml rename to .github/workflows/pi_merge.yml From a18cba9bb796d93b76d2383a3c51010e58aaeb22 Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Fri, 6 Dec 2024 14:45:49 +0100 Subject: [PATCH 5/6] perf: rename pi_merge workflow --- .github/workflows/pi_merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pi_merge.yml b/.github/workflows/pi_merge.yml index 93fb50c..b30a834 100644 --- a/.github/workflows/pi_merge.yml +++ b/.github/workflows/pi_merge.yml @@ -1,4 +1,4 @@ -name: 'Parent Images: Submodules Merge' +name: 'Parent Images: Parent Image Merge' on: workflow_dispatch: @@ -12,7 +12,7 @@ permissions: actions: read jobs: - call-pi-merge-submodule: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_submodule.yml@dev + call-pi-merge-parent-image: + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_parent_image.yml@dev if: ${{ github.event.pull_request.merged }} secrets: inherit \ No newline at end of file From 2653efcac77aad392e542d8b59bd2c4ed826c40a Mon Sep 17 00:00:00 2001 From: andhreljaKern Date: Fri, 6 Dec 2024 14:53:47 +0100 Subject: [PATCH 6/6] fix: rename 'uses' workflow --- .github/workflows/pi_merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pi_merge.yml b/.github/workflows/pi_merge.yml index b30a834..4bfcab2 100644 --- a/.github/workflows/pi_merge.yml +++ b/.github/workflows/pi_merge.yml @@ -13,6 +13,6 @@ permissions: jobs: call-pi-merge-parent-image: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_parent_image.yml@dev + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_submodule.yml@dev if: ${{ github.event.pull_request.merged }} secrets: inherit \ No newline at end of file