From f73fe6ec00a3de3c5ff01222e9a77c81f8a98282 Mon Sep 17 00:00:00 2001
From: meskio <meskio@torproject.org>
Date: Wed, 9 Aug 2023 11:14:47 +0200
Subject: [PATCH] Keep the 'v' from the tag on the released .tar.gz

Gitlab doesn't support '#v' expansion for the links name and url:
https://docs.gitlab.com/ee/ci/variables/where_variables_can_be_used.html
https://docs.gitlab.com/ee/ci/variables/where_variables_can_be_used.html#gitlab-internal-variable-expansion-mechanism

The current releases include a 'snowflake-.tar.gz' that gives a 404,
because the link provided is missing the tag part. Let's keep it
simple and produce a tar.gz with the v in the name like
snowflake-v2.6.0.tar.gz

Closes: #40282
---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8a8a31..70a0ffe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,12 +177,12 @@ generate_tarball:
     - if: $CI_COMMIT_TAG
   script:
     - go mod vendor
-    - tar czf ${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz --transform "s,^,${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}/," *
+    - tar czf ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.gz --transform "s,^,${CI_PROJECT_NAME}-${CI_COMMIT_TAG}/," *
   after_script:
     - echo TAR_JOB_ID=$CI_JOB_ID >> generate_tarball.env
   artifacts:
     paths:
-      - ${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz
+      - ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.gz
     reports:
       dotenv: generate_tarball.env
 
@@ -203,6 +203,6 @@ release-job:
     ref: '$CI_COMMIT_TAG'
     assets:
       links:
-        - name: '${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz'
-          url: '${CI_PROJECT_URL}/-/jobs/${TAR_JOB_ID}/artifacts/file/${CI_PROJECT_NAME}-${CI_COMMIT_TAG#v}.tar.gz'
+        - name: '${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.gz'
+          url: '${CI_PROJECT_URL}/-/jobs/${TAR_JOB_ID}/artifacts/file/${CI_PROJECT_NAME}-${CI_COMMIT_TAG}.tar.gz'