From 80bbd8753b922314f97f34df409e46daac916a54 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 18 Sep 2022 18:16:59 +0200 Subject: [PATCH] fix missing revision passing for release, nicer vars --- .github/workflows/build.yml | 5 ++++- .github/workflows/preparerelease.yml | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ec82002..5bdf57e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,4 +51,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: build - run: cd contrib/docker && GIT_BRANCH=${GITHUB_REF##*/} LIMITARCH=${{ github.event.inputs.limitarch }} GIT_REVISION=${{ steps.gittag.outputs.describe }} ./build.sh + run: cd contrib/docker && GIT_BRANCH=${GITHUB_REF##*/} ./build.sh + env: + GIT_REVISION: ${{ steps.gittag.outputs.describe }} + LIMITARCH: ${{ github.event.inputs.limitarch }} diff --git a/.github/workflows/preparerelease.yml b/.github/workflows/preparerelease.yml index 54215b54..bd5484a4 100644 --- a/.github/workflows/preparerelease.yml +++ b/.github/workflows/preparerelease.yml @@ -36,6 +36,10 @@ jobs: - name: checkout uses: actions/checkout@v2 + - + name: gh-describe + id: gittag + uses: proudust/gh-describe@v1.4.6 - name: set up QEMU uses: docker/setup-qemu-action@v1 @@ -51,6 +55,7 @@ jobs: env: UPLOAD_URL: ${{ secrets.UPLOAD_URL }} UPLOAD_CREDENTIALS: ${{ secrets.UPLOAD_CREDENTIALS }} + GIT_REVISION: ${{ steps.gittag.outputs.describe }} LIMITARCH: ${{ github.event.inputs.limitarch }} LIMITIMG: ${{ github.event.inputs.limitimg }} -