#7: Attempting to resolve git tag retrieving

riotkit-org · Nov 15, 2020 · 2860a7e · 2860a7e
1 parent 6ad2679
commit 2860a7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/test-and-release.yaml b/.github/workflows/test-and-release.yaml
@@ -32,13 +32,6 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v2
 
-            - name: Parse version
-              id: branch_name
-              run: |
-                  echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
-                  echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
-                  echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
             - name: "Login to quay"
               uses: docker/login-action@v1
               with:
@@ -55,10 +48,10 @@ jobs:
               run: "pip install -r ./requirements.txt && pip install -r ./requirements-dev.txt"
 
             - name: Release to docker registry (x86)
-              run: "RKD_COMPAT_SUBPROCESS=true rkd :release:docker:x86 --git-tag=${{ steps.branch_name.outputs.SOURCE_TAG }}"
+              run: "RKD_COMPAT_SUBPROCESS=true rkd :release:docker:x86 --git-tag=${GITHUB_REF}"
 
 #            - name: Release to docker registry (arm)
-#              run: "rkd :release:docker:x86 --git-tag=${{ steps.branch_name.outputs.SOURCE_TAG }}"
+#              run: "rkd :release:docker:x86 --git-tag=${GITHUB_REF}"
 
             - name: Release to PyPI
               run: "rkd :release:pypi --token=${{ secrets.PYPI_TOKEN }}"
diff --git a/.rkd/makefile.yaml b/.rkd/makefile.yaml
@@ -43,7 +43,12 @@ tasks:
             docker_tag = 'latest-dev-' + arch
             repo = os.getenv('REPO')
 
-            if tag:
+            if "refs" in tag:
+                if "refs/tags" in tag:
+                    docker_tag = tag[len('refs/tags/'):]
+                else:
+                    docker_tag = 'latest-dev-' + arch
+            elif tag:
                 docker_tag = arch + '-' + tag
 
             image_name = '{repo}:{tag}'.format(tag=docker_tag, repo=repo)