revert testing-related temporary changes 😋

Signed-off-by: zFernand0 <[email protected]>
zowe · Feb 1, 2024 · acb10a9 · acb10a9
1 parent 198a855
commit acb10a9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/.github/release.config.js b/.github/release.config.js
@@ -1,9 +1,9 @@
 module.exports = {
     branches: [
         {
-            name: "test",
+            name: "main",
             channel: "latest",
-            // level: "minor",
+            level: "minor",
             devDependencies: {
                 "@zowe/imperative": "zowe-v2-lts",
                 "@zowe/zowe-explorer-api": "zowe-v2-lts",

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,10 +20,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x]
-        os: [ubuntu-latest]
-        # node-version: [16.x, 18.x]
-        # os: [windows-latest, ubuntu-latest, macos-latest]
+        node-version: [16.x, 18.x, 20.x]
+        os: [windows-latest, ubuntu-latest, macos-latest]
 
     env:
       OS: ${{ matrix.os }}
@@ -68,17 +66,17 @@ jobs:
       if: ${{ always() && steps.build.outcome == 'success' }}
       run: npm run test:unit
 
-    # - name: Archive Results
-    #   if: ${{ always() && steps.build.outcome == 'success' }}
-    #   uses: actions/upload-artifact@v3
-    #   with:
-    #     name: ${{ matrix.os }}-${{ matrix.node-version }}-results
-    #     path: packages/*/__tests__/__results__/
+    - name: Archive Results
+      if: ${{ always() && steps.build.outcome == 'success' }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.os }}-${{ matrix.node-version }}-results
+        path: packages/*/__tests__/__results__/
 
-    # - name: Upload Results to Codecov
-    #   uses: codecov/codecov-action@v3
-    #   with:
-    #     env_vars: OS,NODE
+    - name: Upload Results to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        env_vars: OS,NODE
 
     # - name: Bundle all packages
     #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
@@ -92,7 +90,7 @@ jobs:
     #     path: dist/*
 
   release:
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    if: github.event_name == 'push' && github.ref_protected
     needs: test
     runs-on: ubuntu-latest
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -39,7 +39,7 @@
     "package": "node ../../scripts/bundleTgz.js",
     "test": "npm run test:unit && npm run test:system",
     "test:system": "jest --config system.jest_config.ts",
-    "test:unit": "jest __tests__/__unit__/get/Get.definition.unit.test.ts --config unit.jest_config.ts",
+    "test:unit": "jest --config unit.jest_config.ts",
     "installPlugin": "npm install && npm run clean && npm run build && zowe plugins install .",
     "preshrinkwrap": "node ../../scripts/rewriteShrinkwrap.js",
     "typedoc": "typedoc --out ./docs/typedoc/ ./src/ --disableOutputCheck"

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -38,7 +38,7 @@
     "package": "npm pack --pack-destination=../../dist",
     "test": "npm run test:unit && npm run test:system",
     "test:system": "jest --config system.jest_config.ts",
-    "test:unit": "jest __tests__/__unit__/get/Get.resource.unit.test.ts --config unit.jest_config.ts",
+    "test:unit": "jest --config unit.jest_config.ts",
     "installPlugin": "npm install && npm run clean && npm run build && zowe plugins install .",
     "typedoc": "typedoc --out ./docs/typedoc/ ./src/ --disableOutputCheck"
   },