From aaaed0054c1608714fc9703c07f89b77bdfa9c81 Mon Sep 17 00:00:00 2001 From: Daniel Barnes Date: Wed, 26 Jul 2023 12:02:02 -0700 Subject: [PATCH 1/7] cuda 11.2.2 (#1405) --- .github/workflows/images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index a89d56931..f387af46e 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -21,7 +21,7 @@ jobs: - 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 From 53576164cccf7eb31be2c2a2db81a38c5a85febd Mon Sep 17 00:00:00 2001 From: Daniel Barnes Date: Wed, 26 Jul 2023 13:38:24 -0700 Subject: [PATCH 2/7] additional cuda updates (#1406) * additional cuda update * ref correct version * Update README.md * readme links * typo --------- Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com> --- .github/workflows/images.yml | 4 ++-- README.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index f387af46e..b81f1fa7a 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -16,8 +16,8 @@ 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 diff --git a/README.md b/README.md index 574b05332..0dd84e15e 100644 --- a/README.md +++ b/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 From f050c118bed5f629e45882e48dbf0f59b20047f0 Mon Sep 17 00:00:00 2001 From: Nicolas Pierre Date: Wed, 26 Jul 2023 23:02:18 +0200 Subject: [PATCH 3/7] fix: replace deprecated gitlab ci var (#1404) * fix: replace deprecated gitlab ci var GitLab 16.x deprecated several variables including CI_BUILD_REF_NAME. In order to be exhaustive, two variables are replacing it: CI_COMMIT_BRANCH (prefered) and CI_COMMIT_REF_NAME. Issue: #1403 * Update src/drivers/gitlab.js * ci: add expires_at in gitlab credentials --------- Co-authored-by: Daniel Barnes --- .github/workflows/gitlab.yml | 2 +- src/drivers/gitlab.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml index 56b455fb8..a66e7d61c 100644 --- a/.github/workflows/gitlab.yml +++ b/.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! " diff --git a/src/drivers/gitlab.js b/src/drivers/gitlab.js index f5cb6a7df..932964ea6 100644 --- a/src/drivers/gitlab.js +++ b/src/drivers/gitlab.js @@ -530,7 +530,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() { From 7fff4011587fc1872526231df22dd1066165ae3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 21:49:11 -0700 Subject: [PATCH 4/7] Bump word-wrap from 1.2.3 to 1.2.4 (#1402) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Barnes --- package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 951960e43..139d61786 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7457,8 +7457,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "license": "MIT", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "engines": { "node": ">=0.10.0" } @@ -12338,7 +12339,9 @@ } }, "word-wrap": { - "version": "1.2.3" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==" }, "wrap-ansi": { "version": "7.0.0", From 2717e6ff10c97b6f83004987c4e585dee98d0998 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 22:03:26 -0700 Subject: [PATCH 5/7] Bump semver from 7.3.7 to 7.5.2 (#1400) Bumps [semver](https://github.com/npm/node-semver) from 7.3.7 to 7.5.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.3.7...v7.5.2) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Barnes --- package-lock.json | 11 +++++++---- package.json | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 139d61786..5713710e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,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", @@ -6363,8 +6363,9 @@ } }, "node_modules/semver": { - "version": "7.3.7", - "license": "ISC", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -11656,7 +11657,9 @@ } }, "semver": { - "version": "7.3.7", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "requires": { "lru-cache": "^6.0.0" }, diff --git a/package.json b/package.json index b75abb02f..22f639ef8 100644 --- a/package.json +++ b/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", From cbd84c4a12f44c6ff368ceac04f68cf3200c91ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:15:24 -0700 Subject: [PATCH 6/7] Bump tough-cookie from 4.0.0 to 4.1.3 (#1399) Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3. - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.0.0...v4.1.3) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Daniel Barnes --- package-lock.json | 68 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5713710e2..5883e82db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6057,6 +6057,12 @@ "node": ">=6" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "node_modules/queue-microtask": { "version": "1.2.3", "funding": [ @@ -6196,6 +6202,12 @@ "node": ">=0.10.0" } }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "node_modules/resolve": { "version": "1.22.1", "dev": true, @@ -6897,22 +6909,25 @@ } }, "node_modules/tough-cookie": { - "version": "4.0.0", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { "node": ">=6" } }, "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.1.2", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4.0.0" } @@ -7164,6 +7179,16 @@ "punycode": "^2.1.0" } }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "license": "MIT" @@ -11486,6 +11511,12 @@ "version": "2.1.1", "dev": true }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "queue-microtask": { "version": "1.2.3" }, @@ -11559,6 +11590,12 @@ "require-directory": { "version": "2.1.1" }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "resolve": { "version": "1.22.1", "dev": true, @@ -11993,16 +12030,21 @@ "version": "1.0.1" }, "tough-cookie": { - "version": "4.0.0", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "requires": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "dependencies": { "universalify": { - "version": "0.1.2", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true } } @@ -12155,6 +12197,16 @@ "punycode": "^2.1.0" } }, + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "util-deprecate": { "version": "1.0.2" }, From b64044f104edd1c38134c6b963abff3d79941f94 Mon Sep 17 00:00:00 2001 From: BradyJ27 Date: Thu, 27 Jul 2023 20:33:45 -0600 Subject: [PATCH 7/7] runner: Convert idle-timeout="never" to 0 with GitLab driver (#1408) * runner: Convert idle-timeout="never" to 0 with GitLab driver GitLab runners do not support "never" as an argument for --wait-timeout, instead this should be 0, which by default is no timeout. Fixes #1407 * Fix linting error * Update src/drivers/gitlab.js --------- Co-authored-by: Daniel Barnes --- src/drivers/gitlab.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/drivers/gitlab.js b/src/drivers/gitlab.js index 932964ea6..489f64d35 100644 --- a/src/drivers/gitlab.js +++ b/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' : ''} \