From 66047df78a295f5dee39831fe8abccc41573ebd2 Mon Sep 17 00:00:00 2001 From: Ravinou Date: Thu, 26 Dec 2024 15:47:44 +0100 Subject: [PATCH] =?UTF-8?q?config:=20=F0=9F=94=A7=20update=20CI/CD=20to=20?= =?UTF-8?q?include=20commit=20version=20on=20develop=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-image-develop.yml | 54 ++++++++++++---------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/.github/workflows/docker-image-develop.yml b/.github/workflows/docker-image-develop.yml index 4ce762a..509c1ec 100644 --- a/.github/workflows/docker-image-develop.yml +++ b/.github/workflows/docker-image-develop.yml @@ -1,29 +1,35 @@ name: Build and Push Docker Image for Develop Branch on: - push: - branches: - - 'develop' + push: + branches: + - 'develop' jobs: - docker: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: . - push: true - platforms: linux/amd64,linux/arm64 # linux/arm/v7 arm32 is not supported by node20 https://github.com/nodejs/docker-node/issues/1946 - tags: borgwarehouse/borgwarehouse:develop + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Update package.json version + run: | + COMMIT=$(git rev-parse --short HEAD) + echo "Current Commit: $COMMIT" + jq '.version = "develop-'$COMMIT'"' package.json > package.tmp.json + mv package.tmp.json package.json + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: . + push: true + platforms: linux/amd64,linux/arm64 # linux/arm/v7 arm32 is not supported by node20 https://github.com/nodejs/docker-node/issues/1946 + tags: borgwarehouse/borgwarehouse:develop