update to support modern gitlab build env variables

itchio · Dec 12, 2024 · 678ef13 · 678ef13
1 parent 0bdec4e
commit 678ef13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -51,7 +51,6 @@ build:linux:x86_64:
   tags:
     - linux
   script:
-    - env
     - npm ci --no-audit
     - node release/build.js --os linux --arch x86_64
   artifacts:

diff --git a/release/build.js b/release/build.js
@@ -156,13 +156,13 @@ async function main(args) {
 
   let version = "head";
   let builtAt = $$(`date +%s`);
-  if (process.env.CI_BUILD_TAG) {
-    version = process.env.CI_BUILD_TAG;
+  if (process.env.CI_COMMIT_TAG) {
+    version = process.env.CI_COMMIT_TAG;
   } else if (
-    process.env.CI_BUILD_REF_NAME &&
-    process.env.CI_BUILD_REF_NAME !== "master"
+    process.env.CI_COMMIT_REF_NAME &&
+    process.env.CI_COMMIT_REF_NAME !== "master"
   ) {
-    version = process.env.CI_BUILD_REF_NAME;
+    version = process.env.CI_COMMIT_REF_NAME;
   }
 
   let bi = `github.com/itchio/butler/buildinfo`;
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,6 @@ build:linux:x86_64: @@
       tags:
         - linux
       script:
-        - env
         - npm ci --no-audit
         - node release/build.js --os linux --arch x86_64
       artifacts:
@@ Expand Down @@