Skip to content

Commit

Permalink
Merge pull request #4627 from coralproject/fix/build-tag-push
Browse files Browse the repository at this point in the history
Fix build-tag-push step in GitHub Actions
  • Loading branch information
nick-funk authored May 30, 2024
2 parents ffe0f90 + 5cef7d1 commit 1df2c6e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: cd client && ./node_modules/.bin/bundlesize --enable-github-checks
# Build tag push the image after a merge to develop
- name: Build, Tag, Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: github.ref == 'refs/heads/develop'
with:
push: true
Expand All @@ -96,7 +96,7 @@ jobs:
cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-develop
# Build tag push the release candidate image when the branch name begins with release-
- name: Build, Tag, Push RC
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
if: startsWith( github.ref, 'refs/heads/release-')
with:
push: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.REPO_PATCHED_DEPLOY_KEY }}
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
echo "MINOR_TAG=${MAJOR}.${MINOR}" >> $GITHUB_ENV
echo "PATCH_TAG=${MAJOR}.${MINOR}.${PATCH}" >> $GITHUB_ENV
- name: Build, Tag, Push Major Tag
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MAJOR_TAG }}
Expand All @@ -107,7 +107,7 @@ jobs:
cache-from: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
cache-to: type=registry,ref=${{ env.IMAGE_CACHE_REPOSITORY }}:cache-major
- name: Build, Tag, Push Minor Tag
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ env.IMAGE_REPOSITORY }}:${{ env.MINOR_TAG }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM node:18-alpine
ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider --no-experimental-fetch"

# Install build dependancies.
RUN apk --no-cache --update add g++ make git python3 \
RUN apk --no-cache --update add g++ make git python3 py3-pip py3-setuptools \
&& rm -rf /var/cache/apk/*

RUN npm install -g [email protected]
Expand Down

0 comments on commit 1df2c6e

Please sign in to comment.