fix missing revision passing for release, nicer vars

2022-09-18 18:16:59 +02:00
parent 7d8a87111a
commit 80bbd8753b
2 changed files with 9 additions and 1 deletions
@@ -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 }}
@@ -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 }}
      -