diff --git a/.github/workflows/pi_build.yml b/.github/workflows/pi_build.yml index d55219c..2b6e6de 100644 --- a/.github/workflows/pi_build.yml +++ b/.github/workflows/pi_build.yml @@ -14,4 +14,5 @@ permissions: jobs: call-pi-build: uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_build.yml@dev + if: github.event.pull_request.head.ref == 'parent-image-updates' secrets: inherit \ No newline at end of file diff --git a/.github/workflows/pi_merge.yml b/.github/workflows/pi_merge.yml index 8d43bf4..d9151e4 100644 --- a/.github/workflows/pi_merge.yml +++ b/.github/workflows/pi_merge.yml @@ -5,6 +5,9 @@ on: pull_request: types: [closed] + branches: + - dev + - parent-image-updates permissions: id-token: write @@ -14,59 +17,10 @@ permissions: jobs: call-pi-merge-parent-image: uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_merge_submodule.yml@dev - if: ${{ github.event.pull_request.merged }} + if: ${{ github.event.pull_request.merged && github.event.pull_request.head.ref == 'parent-image-updates' }} secrets: inherit - - pi-matrix: - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_matrix.yml@dev + + call-pi-cleanup-submodule: + uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_cleanup_submodule.yml@dev if: ${{ !github.event.pull_request.merged && github.event.pull_request.head.ref == 'parent-image-updates' }} secrets: inherit - with: - checkout_ref: parent-image-updates - repository: "${{ github.repository_owner }}/refinery-submodule-parent-images" - - call-dc-registry-delete: - name: 'Docker: Delete Branch Images' - needs: [pi-matrix] - uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/dc_registry_delete.yml@dev - secrets: inherit - strategy: - matrix: - parent_image_type: ${{ fromJson(needs.pi-matrix.outputs.parent_image_type) }} - with: - delete_tag: ${{ github.event.pull_request.head.ref }}-${{ matrix.parent_image_type }} - app_name: ${{ vars.PARENT_IMAGE_NAME}} - - gh-delete-submodule-branches: - name: 'GitHub: Delete Submodule Branch' - needs: [call-dc-registry-delete] - if: ${{ !failure() }} - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - token: ${{ secrets.GH_TOKEN }} - - - name: Delete Branch - shell: bash - run: git push origin --delete ${{ github.event.pull_request.head.ref }} - - gh-delete-app-branches: - name: 'GitHub: Delete App Branch' - needs: [pi-matrix, gh-delete-submodule-branches] - if: ${{ !failure() }} - runs-on: ubuntu-latest - strategy: - matrix: - app: ${{ fromJson(needs.pi-matrix.outputs.app) }} - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - repository: "${{ github.repository_owner }}/${{ matrix.app }}" - token: ${{ secrets.GH_TOKEN }} - - - name: Delete Branch - shell: bash - run: git push origin --delete ${{ github.event.pull_request.head.ref }} \ No newline at end of file diff --git a/requirements/common-requirements.txt b/requirements/common-requirements.txt index e41cf96..0e812b3 100644 --- a/requirements/common-requirements.txt +++ b/requirements/common-requirements.txt @@ -14,7 +14,7 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi boto3==1.39.6 # via -r common-requirements.in -botocore==1.39.6 +botocore==1.39.10 # via # boto3 # s3transfer @@ -28,7 +28,7 @@ charset-normalizer==3.4.2 # via requests click==8.2.1 # via uvicorn -fastapi==0.115.2 +fastapi==0.116.1 # via -r mini-requirements.in h11==0.16.0 # via uvicorn @@ -68,7 +68,7 @@ pytz==2025.2 # via pandas requests==2.32.4 # via -r mini-requirements.in -s3transfer==0.13.0 +s3transfer==0.13.1 # via boto3 six==1.17.0 # via python-dateutil @@ -76,7 +76,7 @@ sniffio==1.3.1 # via anyio sqlalchemy==1.4.42 # via -r common-requirements.in -starlette==0.40.0 +starlette==0.47.2 # via fastapi typing-extensions==4.14.1 # via @@ -85,6 +85,7 @@ typing-extensions==4.14.1 # minio # pydantic # pydantic-core + # starlette urllib3==2.5.0 # via # botocore diff --git a/requirements/mini-requirements.in b/requirements/mini-requirements.in index e0b0950..1c6f64b 100644 --- a/requirements/mini-requirements.in +++ b/requirements/mini-requirements.in @@ -1,4 +1,4 @@ -fastapi==0.115.2 +fastapi==0.116.1 uvicorn==0.35.0 pydantic==2.7.4 requests==2.32.4 \ No newline at end of file diff --git a/requirements/mini-requirements.txt b/requirements/mini-requirements.txt index 948555a..0e40652 100644 --- a/requirements/mini-requirements.txt +++ b/requirements/mini-requirements.txt @@ -8,13 +8,13 @@ annotated-types==0.7.0 # via pydantic anyio==4.9.0 # via starlette -certifi==2025.6.15 +certifi==2025.7.14 # via requests charset-normalizer==3.4.2 # via requests -click==8.1.8 +click==8.2.1 # via uvicorn -fastapi==0.115.2 +fastapi==0.116.1 # via -r mini-requirements.in h11==0.16.0 # via uvicorn @@ -32,14 +32,15 @@ requests==2.32.4 # via -r mini-requirements.in sniffio==1.3.1 # via anyio -starlette==0.40.0 +starlette==0.47.2 # via fastapi -typing-extensions==4.14.0 +typing-extensions==4.14.1 # via # anyio # fastapi # pydantic # pydantic-core + # starlette urllib3==2.5.0 # via requests uvicorn==0.35.0 diff --git a/requirements/torch-cpu-requirements.txt b/requirements/torch-cpu-requirements.txt index dccae98..6c7b67e 100644 --- a/requirements/torch-cpu-requirements.txt +++ b/requirements/torch-cpu-requirements.txt @@ -16,7 +16,7 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi boto3==1.39.6 # via -r common-requirements.in -botocore==1.39.6 +botocore==1.39.10 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ charset-normalizer==3.4.2 # via requests click==8.2.1 # via uvicorn -fastapi==0.115.2 +fastapi==0.116.1 # via -r mini-requirements.in filelock==3.18.0 # via @@ -117,7 +117,7 @@ requests==2.32.4 # -r mini-requirements.in # huggingface-hub # transformers -s3transfer==0.13.0 +s3transfer==0.13.1 # via boto3 safetensors==0.5.3 # via transformers @@ -137,7 +137,7 @@ sniffio==1.3.1 # via anyio sqlalchemy==1.4.42 # via -r common-requirements.in -starlette==0.40.0 +starlette==0.47.2 # via fastapi sympy==1.14.0 # via torch @@ -161,6 +161,7 @@ typing-extensions==4.14.1 # minio # pydantic # pydantic-core + # starlette # torch urllib3==2.5.0 # via diff --git a/requirements/torch-cuda-requirements.txt b/requirements/torch-cuda-requirements.txt index b5ba5df..09b95bb 100644 --- a/requirements/torch-cuda-requirements.txt +++ b/requirements/torch-cuda-requirements.txt @@ -16,7 +16,7 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi boto3==1.39.6 # via -r common-requirements.in -botocore==1.39.6 +botocore==1.39.10 # via # boto3 # s3transfer @@ -30,7 +30,7 @@ charset-normalizer==3.4.2 # via requests click==8.2.1 # via uvicorn -fastapi==0.115.2 +fastapi==0.116.1 # via -r mini-requirements.in filelock==3.18.0 # via @@ -117,7 +117,7 @@ requests==2.32.4 # -r mini-requirements.in # huggingface-hub # transformers -s3transfer==0.13.0 +s3transfer==0.13.1 # via boto3 safetensors==0.5.3 # via transformers @@ -137,7 +137,7 @@ sniffio==1.3.1 # via anyio sqlalchemy==1.4.42 # via -r common-requirements.in -starlette==0.40.0 +starlette==0.47.2 # via fastapi sympy==1.14.0 # via torch @@ -161,6 +161,7 @@ typing-extensions==4.14.1 # minio # pydantic # pydantic-core + # starlette # torch urllib3==2.5.0 # via