fix: oclif promote step (#2301)

* fix: upgrade to latest oclif for promote:deb fix. * fix: use correct path to install scripts * chore: update input description, remove unneeded continue-on-error
heroku · Apr 14, 2023 · 4e94fb1 · 4e94fb1
1 parent 5a049c9
commit 4e94fb1
Show file tree

Hide file tree

Showing 30 changed files with 72 additions and 38 deletions.
diff --git a/.github/workflows/pack-and-release.yml b/.github/workflows/pack-and-release.yml
@@ -7,7 +7,7 @@ on:
         type: string
         required: true
       channel:
-        description: \'beta\' or \'stable\' release
+        description: dev, beta or stable release
         type: string
         required: true
       commitSHA:
@@ -165,7 +165,6 @@ jobs:
             shortSHA=`git rev-parse --short=7 HEAD`
           fi
           yarn oclif promote --deb --xz --root="./packages/cli" --indexes --version=${{ inputs.version }} --sha=$shortSHA --channel=${{ inputs.channel }}
-        continue-on-error: true # temporary work around for https://github.com/oclif/oclif/issues/770
       - name: update Linux install scripts
         run: node ./scripts/postrelease/install_scripts.js
 

diff --git a/packages/addons-v5/package.json b/packages/addons-v5/package.json
@@ -27,7 +27,7 @@
     "mocha": "^5.2.0",
     "nock": "9.0.13",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^6.3.5"
   },
   "files": [

diff --git a/packages/apps-v5/package.json b/packages/apps-v5/package.json
@@ -39,7 +39,7 @@
     "netrc-parser": "^3.1.6",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "proxyquire": "^2.1.0",
     "set-tz": "^0.1.0",
     "std-mocks": "1.0.1",

diff --git a/packages/apps/package.json b/packages/apps/package.json
@@ -28,7 +28,7 @@
     "mocha": "^5",
     "nock": "^13.0.1",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10",
     "typescript": "4.8.4"
   },

diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -25,7 +25,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10.9.1",
     "tslib": "^1.9.3",
     "typescript": "4.8.4"

diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json
@@ -29,7 +29,7 @@
     "mocha": "5.2.0",
     "nock": "^10.0.6",
     "nyc": "15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "10.9.1",
     "typescript": "4.8.4"
   },

diff --git a/packages/buildpacks/package.json b/packages/buildpacks/package.json
@@ -31,7 +31,7 @@
     "mocha": "^5",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "tmp": "^0.0.33",
     "ts-node": "^10.9.1",
     "tslib": "^1",

diff --git a/packages/certs-v5/package.json b/packages/certs-v5/package.json
@@ -29,7 +29,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "proxyquire": "^2.1.0",
     "sinon": "^2.3.6",
     "sinon-chai": "^2.14.0"

diff --git a/packages/certs/package.json b/packages/certs/package.json
@@ -18,7 +18,7 @@
     "globby": "^9.0.0",
     "mocha": "^5",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10.9.1",
     "typescript": "4.8.4"
   },

diff --git a/packages/ci-v5/package.json b/packages/ci-v5/package.json
@@ -32,7 +32,7 @@
     "estraverse": "^4.2.0",
     "mocha": "^5.1.1",
     "nock": "^10.0.6",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^1.17.6",
     "std-mocks": "^1.0.1"
   },

diff --git a/packages/ci/package.json b/packages/ci/package.json
@@ -42,7 +42,7 @@
     "mocha": "^5",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10.9.1",
     "typescript": "4.8.4"
   },

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -74,7 +74,7 @@
     "lodash": "^4.17.11",
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "qqjs": "0.3.10",
     "read-pkg": "^4.0.1",
     "sinon": "^7.2.4",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -29,7 +29,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^7.2.4",
     "ts-node": "^10.9.1",
     "tslib": "^1.9.3",

diff --git a/packages/container-registry-v5/package.json b/packages/container-registry-v5/package.json
@@ -29,7 +29,7 @@
     "mockdate": "^2.0.2",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^5.0.7",
     "std-mocks": "^1.0.1"
   },

diff --git a/packages/git/package.json b/packages/git/package.json
@@ -25,7 +25,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10.9.1",
     "tslib": "^1.9.3",
     "typescript": "4.8.4"

diff --git a/packages/local/package.json b/packages/local/package.json
@@ -22,7 +22,7 @@
     "globby": "^8",
     "mocha": "^5",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10",
     "tslib": "^1.9.3",
     "typescript": "4.8.4"

diff --git a/packages/oauth-v5/package.json b/packages/oauth-v5/package.json
@@ -34,7 +34,7 @@
     "mocha-junit-reporter": "1.18.0",
     "nock": "10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4"
+    "oclif": "3.8.1"
   },
   "files": [
     "oclif.manifest.json",

diff --git a/packages/oauth/package.json b/packages/oauth/package.json
@@ -27,7 +27,7 @@
     "globby": "^10",
     "mocha": "^5",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10",
     "typescript": "4.8.4"
   },

diff --git a/packages/orgs-v5/package.json b/packages/orgs-v5/package.json
@@ -50,7 +50,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "proxyquire": "^2.1.0"
   },
   "files": [

diff --git a/packages/pg-v5/package.json b/packages/pg-v5/package.json
@@ -35,7 +35,7 @@
     "mocha": "^5.1.1",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "proxyquire": "^2.1.0",
     "sinon": "^7.2.3",
     "standard": "^12.0.1"

diff --git a/packages/pipelines/package.json b/packages/pipelines/package.json
@@ -35,7 +35,7 @@
     "mocha": "5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^7.4.1",
     "ts-node": "10.9.1",
     "typescript": "4.8.4"

diff --git a/packages/ps/package.json b/packages/ps/package.json
@@ -27,7 +27,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "10.9.1",
     "tslib": "^1.9.3",
     "typescript": "4.8.4"

diff --git a/packages/redis-v5/package.json b/packages/redis-v5/package.json
@@ -26,7 +26,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "proxyquire": "^2.1.0",
     "sinon": "^7.2.3"
   },

diff --git a/packages/run-v5/package.json b/packages/run-v5/package.json
@@ -35,7 +35,7 @@
     "mocha-junit-reporter": "1.18.0",
     "netrc": "0.1.4",
     "nock": "^10.0.6",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^7.2.3"
   },
   "files": [

diff --git a/packages/run/package.json b/packages/run/package.json
@@ -27,7 +27,7 @@
     "http-call": "^5.2.5",
     "mocha": "^5",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^7.4.1",
     "ts-node": "^10",
     "typescript": "4.8.4"

diff --git a/packages/spaces/package.json b/packages/spaces/package.json
@@ -30,7 +30,7 @@
     "mocha": "^5.2.0",
     "nock": "^10.0.6",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "sinon": "^7.2.3"
   },
   "files": [

diff --git a/packages/status/package.json b/packages/status/package.json
@@ -35,7 +35,7 @@
     "globby": "^9.0.0",
     "mocha": "^5.1.1",
     "nock": "^10.0.6",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10.9.1",
     "typescript": "4.8.4"
   },

diff --git a/packages/webhooks/package.json b/packages/webhooks/package.json
@@ -22,7 +22,7 @@
     "globby": "^8",
     "mocha": "^5",
     "nyc": "^15.1.0",
-    "oclif": "3.6.4",
+    "oclif": "3.8.1",
     "ts-node": "^10",
     "typescript": "^4.8.4"
   },

diff --git a/scripts/postrelease/install_scripts.js b/scripts/postrelease/install_scripts.js
@@ -9,9 +9,9 @@ qq.run(async () => {
   const { GITHUB_REF_TYPE, GITHUB_REF_NAME } = process.env
   if (GITHUB_REF_TYPE === 'tag' && GITHUB_REF_NAME.startsWith('v')) {
     const HEROKU_S3_BUCKET = getHerokuS3Bucket()
-    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ./install-standalone.sh "s3://${HEROKU_S3_BUCKET}/install-standalone.sh"`)
-    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ./install-standalone.sh "s3://${HEROKU_S3_BUCKET}/install.sh"`)
-    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ./install-ubuntu.sh "s3://${HEROKU_S3_BUCKET}/install-ubuntu.sh"`)
+    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ../../install-standalone.sh "s3://${HEROKU_S3_BUCKET}/install-standalone.sh"`)
+    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ../../install-standalone.sh "s3://${HEROKU_S3_BUCKET}/install.sh"`)
+    await execa(`aws s3 cp --content-type text/plain --cache-control "max-age: 604800" ../../install-ubuntu.sh "s3://${HEROKU_S3_BUCKET}/install-ubuntu.sh"`)
   } else {
     console.log('Not on stable release, skipping updating install scripts')
   }

diff --git a/yarn.lock b/yarn.lock
@@ -1681,7 +1681,7 @@
     widest-line "^3.1.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/core@^2.0.3", "@oclif/core@^2.0.8":
+"@oclif/core@^2.0.8":
   version "2.1.5"
   resolved "https://registry.npmjs.org/@oclif/core/-/core-2.1.5.tgz"
   integrity sha512-vwktkhUFco3roVCaK20RLUQURb/IcPyvBQrZBn02mmNw+l5S4w4LEII60ArPY+pf0NjG5ElFKnrOXPaqaYxyYw==
@@ -1854,6 +1854,41 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
+"@oclif/core@^2.8.0":
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.8.2.tgz#86fc31f20419dbb3cd25f89f4f1d83760c60f7c0"
+  integrity sha512-g50NrCdEcFlBfuwZb9RxLmxPNQ9wIaBPOiwbxlGYRkHMnsC6LNHcvVtyDnmndU8qoXrmCOZ6ocSZenOMlG+G1w==
+  dependencies:
+    "@types/cli-progress" "^3.11.0"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    chalk "^4.1.2"
+    clean-stack "^3.0.1"
+    cli-progress "^3.12.0"
+    debug "^4.3.4"
+    ejs "^3.1.8"
+    fs-extra "^9.1.0"
+    get-package-type "^0.1.0"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.2"
+    semver "^7.3.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    ts-node "^10.9.1"
+    tslib "^2.5.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
 "@oclif/[email protected]", "@oclif/errors@^1.2.2", "@oclif/errors@^1.3.5", "@oclif/errors@^1.3.6":
   version "1.3.6"
   resolved "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.6.tgz"
@@ -9379,12 +9414,12 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-oclif@3.6.4:
-  version "3.6.4"
-  resolved "https://registry.npmjs.org/oclif/-/oclif-3.6.4.tgz"
-  integrity sha512-RYWmKQM5jammrHTF33DGBfBAaYxdARkc0VvUNpLtg8AFu5x91FxaOHdbOAYwkzPMC168MZ+O/EFi4jM96GxvPA==
+oclif@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/oclif/-/oclif-3.8.1.tgz#15be26a8ce842b690c8384b4056fcf67394caa11"
+  integrity sha512-1yc1rtsQrou6t21WYM6JM2fUzK3GKhGboB/A6ZeTFyC3VJb39fUWcRrQYE1JEoNlBHk5Z5hok8PEq09Vhm4ZZA==
   dependencies:
-    "@oclif/core" "^2.0.3"
+    "@oclif/core" "^2.8.0"
     "@oclif/plugin-help" "^5.1.19"
     "@oclif/plugin-not-found" "^2.3.7"
     "@oclif/plugin-warn-if-update-available" "^2.0.14"