Merge pull request #1467 from zowe/rust-1.61

Lock down Rust version across all workflows
zowe · Jul 7, 2022 · 59d196d · 59d196d
2 parents afecec2 + 74bf6af
commit 59d196d
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 46 deletions.
diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml
@@ -68,7 +68,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: stable
+        toolchain: 1.61.0
         override: true
 
     - uses: actions/download-artifact@v2
@@ -110,6 +110,13 @@ jobs:
 
     steps:
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: 1.61.0
+        override: true
+
     - uses: actions/download-artifact@v2
       with:
         name: repo
@@ -149,6 +156,13 @@ jobs:
 
     steps:
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: 1.61.0
+        override: true
+
     - uses: actions/download-artifact@v2
       with:
         name: repo

diff --git a/.github/workflows/rust-cli.yml b/.github/workflows/rust-cli.yml
@@ -26,8 +26,9 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: stable
+        toolchain: 1.61.0
         override: true
+        components: clippy
 
     - name: Build
       run: cargo build --verbose --manifest-path=zowex/Cargo.toml
@@ -44,6 +45,12 @@ jobs:
         name: zowe-linux.tgz
         path: zowex/target/debug/zowe.tgz
 
+    - name: Run linter
+      uses: actions-rs/clippy-check@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        args: --manifest-path=zowex/Cargo.toml
+
     - name: Run tests
       run: cargo test unit --verbose --manifest-path=zowex/Cargo.toml -- --nocapture
 
@@ -53,6 +60,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: 1.61.0
+        override: true
+
     - name: Build
       run: cargo build --verbose --manifest-path=zowex/Cargo.toml
 
@@ -77,6 +91,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: 1.61.0
+        override: true
+
     - name: Build
       run: cargo build --verbose --manifest-path=zowex/Cargo.toml
 

diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -44,7 +44,7 @@
     "@types/js-yaml": "^4.0.0",
     "@types/node": "^14.14.37",
     "@types/uuid": "^8.3.0",
-    "@zowe/imperative": "5.3.4",
+    "@zowe/imperative": "5.3.5",
     "eslint": "^7.32.0",
     "typescript": "^4.2.3"
   },

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "prepack": "node scripts/prepareLicenses.js"
   },
   "dependencies": {
-    "@zowe/imperative": "5.3.4",
+    "@zowe/imperative": "5.3.5",
     "@zowe/perf-timing": "1.0.7"
   },
   "devDependencies": {

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Updated Imperative to fix CLI commands failing with error "Cannot find module 'ansi-colors'".
+
 ## `7.3.0`
 
 - Enhancement: Added the `zowe files download data-sets-matching` command to download multiple data sets at once. [#1287](https://github.com/zowe/zowe-cli/issues/1287)

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@zowe/core-for-zowe-sdk": "7.3.0",
-    "@zowe/imperative": "5.3.4",
+    "@zowe/imperative": "5.3.5",
     "@zowe/perf-timing": "1.0.7",
     "@zowe/provisioning-for-zowe-sdk": "7.3.0",
     "@zowe/zos-console-for-zowe-sdk": "7.3.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@types/node": "^12.12.24",
     "@zowe/cli-test-utils": "7.3.0",
-    "@zowe/imperative": "5.3.4",
+    "@zowe/imperative": "5.3.5",
     "chalk": "^4.1.0",
     "eslint": "^7.32.0",
     "madge": "^4.0.1",

diff --git a/packages/provisioning/package.json b/packages/provisioning/package.json
@@ -52,7 +52,7 @@
     "@types/node": "^12.12.24",
     "@zowe/cli-test-utils": "7.3.0",
     "@zowe/core-for-zowe-sdk": "7.3.0",
-    "@zowe/imperative": "5.3.4",
+    "@zowe/imperative": "5.3.5",
     "eslint": "^7.32.0",
     "madge": "^4.0.1",
     "rimraf": "^2.6.3",