Merge branch 'master' into snyk-upgrade-7e1d374d6f34ba5aa2e05c8e090c2b2a

.github/workflows/gitlab.yml

@@ -28,7 +28,7 @@ jobs:
           ; user.password = '${{ github.token }}'
           ; user.password_confirmation = '${{ github.token }}'
           ; user.save!
-          ; token = user.personal_access_tokens.create(scopes: [:api], name: 'Token')
+          ; token = user.personal_access_tokens.create(scopes: [:api], name: 'Token', expires_at: 1.days.from_now)
           ; token.set_token('${{ github.token }}')
           ; token.save!
           "

.github/workflows/images.yml

@@ -16,12 +16,12 @@ jobs:
           - base: 0
             ubuntu: 18.04
             python: 2.7
-            cuda: 10.1
-            cudnn: 7
+            cuda: 11.2.2
+            cudnn: 8
           - base: 1
             ubuntu: 20.04
             python: 3.8
-            cuda: 11.2.1
+            cuda: 11.2.2
             cudnn: 8
           - latest: true # update the values below after introducing a new major version
             base: 1

README.md

@@ -641,3 +641,7 @@ These are some example projects using CML.
   :key:
 
 :key: needs a [PAT](#environment-variables).
+
+
+# :warning: Maintenance :warning:
+- ~2023-07 Nvidia has dropped container CUDA images with [10.x](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=10)/[cudnn7](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=cudnn7) and [11.2.1](https://hub.docker.com/r/nvidia/cuda/tags?page=1&name=11.2.1), CML images will be updated accrodingly

package.json

@@ -93,7 +93,7 @@
     "proxy-agent": "^5.0.0",
     "pseudoexec": "^0.2.0",
     "remark": "^13.0.0",
-    "semver": "^7.3.5",
+    "semver": "^7.5.2",
     "simple-git": "^3.16.0",
     "strip-ansi": "^6.0.1",
     "strip-url-auth": "^1.0.1",

src/drivers/gitlab.js

@@ -200,6 +200,11 @@ class Gitlab {
       const { protocol, host } = new URL(this.repo);
       const { token } = await this.registerRunner({ tags: labels, name });
 
+      let waitTimeout = idleTimeout;
+      if (idleTimeout === 'never') {
+        waitTimeout = '0';
+      }
+
       let dockerVolumesTpl = '';
       dockerVolumes.forEach((vol) => {
         dockerVolumesTpl += `--docker-volumes ${vol} `;
@@ -210,7 +215,7 @@ class Gitlab {
         --url "${protocol}//${host}" \
         --name "${name}" \
         --token "${token}" \
-        --wait-timeout ${idleTimeout} \
+        --wait-timeout ${waitTimeout} \
         --executor "${IN_DOCKER ? 'shell' : 'docker'}" \
         --docker-image "iterativeai/cml:${gpu ? 'latest-gpu' : 'latest'}" \
         ${gpu ? '--docker-runtime nvidia' : ''} \
@@ -530,7 +535,10 @@ class Gitlab {
   }
 
   get branch() {
-    return process.env.CI_BUILD_REF_NAME;
+    if ('CI_COMMIT_BRANCH' in process.env) {
+      return process.env.CI_COMMIT_BRANCH;
+    }
+    return process.env.CI_COMMIT_REF_NAME;
   }
 
   get userEmail() {