From 4c418b0cf33d8a0753505dcaa28b0d0159bb47ae Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Thu, 24 Oct 2024 14:58:00 +0300 Subject: [PATCH] git-version config fixes, release workflow caching improvements --- .github/workflows/release.yml | 12 +++++++++--- ci/git-version.yml | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 220eaf01..51b00bc6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,8 +56,8 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64 push: false - cache-from: type=inline - cache-to: type=inline,mode=max + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache,mode=max tags: | usabilitydynamics/udx-worker:${{ steps.gitversion.outputs.semVer }} @@ -125,6 +125,12 @@ jobs: username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} + - name: Load Docker cache + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }} + - name: Push Docker image uses: docker/build-push-action@v6 with: @@ -132,7 +138,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64 push: true - cache-from: type=inline,mode=max + cache-from: type=local,src=/tmp/.buildx-cache tags: | usabilitydynamics/udx-worker:${{ needs.test-pipeline.outputs.semVer }} usabilitydynamics/udx-worker:latest diff --git a/ci/git-version.yml b/ci/git-version.yml index 13bee63e..d2ebbf37 100644 --- a/ci/git-version.yml +++ b/ci/git-version.yml @@ -1,9 +1,9 @@ mode: ContinuousDeployment branches: - release: + latest: regex: ^latest$ - tag: "" + tag: "release" increment: Minor develop: @@ -12,4 +12,4 @@ branches: increment: Patch assembly-versioning-scheme: MajorMinorPatch -continuous-delivery-fallback-tag: ci +continuous-deployment-fallback-tag: beta