From 65bf6ba64cd208524fe7039a1ea1b441faeec934 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Tue, 26 Aug 2025 13:36:59 +0100 Subject: [PATCH] push fixes for secrets --- .github/workflows/PR-Auto-Deploy-V2.yml | 15 ++------------- .github/workflows/deploy-on-v2-commit.yml | 17 ++--------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/PR-Auto-Deploy-V2.yml b/.github/workflows/PR-Auto-Deploy-V2.yml index f88ce78b7..dc35f4913 100644 --- a/.github/workflows/PR-Auto-Deploy-V2.yml +++ b/.github/workflows/PR-Auto-Deploy-V2.yml @@ -260,8 +260,8 @@ jobs: echo "Backend image needs to be built" fi - - name: Build and push V2 frontend image (with NPM token) - if: steps.check-frontend.outputs.exists == 'false' && secrets.NPM_TOKEN != '' + - name: Build and push V2 frontend image + if: steps.check-frontend.outputs.exists == 'false' uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 with: context: . @@ -273,17 +273,6 @@ jobs: secrets: | npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} - - name: Build and push V2 frontend image (anonymous) - if: steps.check-frontend.outputs.exists == 'false' && secrets.NPM_TOKEN == '' - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 - with: - context: . - file: ./docker/frontend/Dockerfile - push: true - tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} - build-args: VERSION_TAG=v2-alpha - platforms: linux/amd64 - - name: Build and push V2 backend image if: steps.check-backend.outputs.exists == 'false' uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 diff --git a/.github/workflows/deploy-on-v2-commit.yml b/.github/workflows/deploy-on-v2-commit.yml index 4712eb20e..78af03d7c 100644 --- a/.github/workflows/deploy-on-v2-commit.yml +++ b/.github/workflows/deploy-on-v2-commit.yml @@ -91,8 +91,8 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_API }} - - name: Build and push frontend image (with NPM token) - if: steps.check-frontend.outputs.exists == 'false' && secrets.NPM_TOKEN != '' + - name: Build and push frontend image + if: steps.check-frontend.outputs.exists == 'false' uses: docker/build-push-action@v6 with: context: . @@ -105,19 +105,6 @@ jobs: platforms: linux/amd64 secrets: | npmrc=//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} - - - name: Build and push frontend image (anonymous) - if: steps.check-frontend.outputs.exists == 'false' && secrets.NPM_TOKEN == '' - uses: docker/build-push-action@v6 - with: - context: . - file: ./docker/frontend/Dockerfile - push: true - tags: | - ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} - ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-latest - build-args: VERSION_TAG=v2-alpha - platforms: linux/amd64 - name: Build and push backend image if: steps.check-backend.outputs.exists == 'false'