Merge pull request #88 from zowe/publish-v2

Publish v2
zowe · Feb 6, 2024 · 83c7e1e · 83c7e1e
2 parents 0d3218b + 400f58c
commit 83c7e1e
Show file tree

Hide file tree

Showing 17 changed files with 94 additions and 85 deletions.
diff --git a/.github/release.config.js b/.github/release.config.js
@@ -6,7 +6,7 @@ module.exports = {
             level: "minor",
             devDependencies: {
                 "@zowe/imperative": "zowe-v2-lts",
-                "@zowe/zowe-explorer-api": "zowe-v2-lts",
+                "@zowe/zowe-explorer-api": ["zowe-v2-lts", "@zowe:registry=https://registry.npmjs.org/"],
             }
         },
         {
@@ -15,7 +15,7 @@ module.exports = {
             level: "patch",
             devDependencies: {
                 "@zowe/imperative": "zowe-v1-lts",
-                "@zowe/zowe-explorer-api": "zowe-v1-lts",
+                "@zowe/zowe-explorer-api": ["zowe-v1-lts", "@zowe:registry=https://registry.npmjs.org/"],
             }
         },
         {
@@ -25,7 +25,7 @@ module.exports = {
             prerelease: true,
             devDependencies: {
                 "@zowe/imperative": "next",
-                "@zowe/zowe-explorer-api": "next",
+                "@zowe/zowe-explorer-api": ["next", "@zowe:registry=https://registry.npmjs.org/"],
             }
         }
     ],
@@ -44,10 +44,12 @@ module.exports = {
         [
             "@octorelease/lerna",
             {
-                pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"],
+                // The shrinkwrap pruning should happen after only as part of the prepack of the CLI Plug-in
+                // pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"],
+
                 // Use Lerna only for versioning and publish packages independently
                 npmPublish: false,
-                versionIndependent: ["cics-extension-for-zowe"]
+                versionIndependent: ["cics-extension-for-zowe"],
             },
         ],
         [
@@ -57,24 +59,22 @@ module.exports = {
                 aliasTags: {
                     "latest": ["zowe-v2-lts"],
                 },
-                npmPublish: false,
-                tarballDir: "dist",
+                npmPublish: true,
             },
             {
                 $cwd: "packages/cli",
                 aliasTags: {
                     "latest": ["zowe-v2-lts"],
                 },
-                npmPublish: false,
-                tarballDir: "dist",
+                npmPublish: true,
             },
         ],
         [
             "@octorelease/vsce",
             {
                 $cwd: "packages/vsce",
-                ovsxPublish: false,
-                vscePublish: false,
+                ovsxPublish: true,
+                vscePublish: true,
                 vsixDir: "dist",
             },
         ],

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -16,12 +16,12 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: lts/*
 

diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml
@@ -9,7 +9,7 @@ jobs:
     name: Process Label Action
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Process Label Action
         uses: hramos/respond-to-issue-based-on-label@v2

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: lts/*
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,6 +5,8 @@ on:
     paths:
       - .github/**
       - packages/**
+      - .npmrc
+      - package.json
   pull_request:
     paths:
       - packages/**
@@ -36,10 +38,10 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -48,14 +50,6 @@ jobs:
         echo "::remove-matcher owner=eslint-compact::"
         echo "::remove-matcher owner=eslint-stylish::"
 
-    # - name: Install turbo based on the OS
-    #   run: |
-    #     os_name="${{ matrix.os }}"
-    #     os_name="${os_name/windows-latest/windows}"
-    #     os_name="${os_name/ubuntu-latest/linux}"
-    #     os_name="${os_name/macos-latest/darwin}"
-    #     npm i "turbo-${os_name}-64"
-
     - name: Install Dependencies
       run: npm ci
 
@@ -76,23 +70,24 @@ jobs:
 
     - name: Archive Results
       if: ${{ always() && steps.build.outcome == 'success' }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.os }}-${{ matrix.node-version }}-results
         path: packages/*/__tests__/__results__/
 
     - name: Upload Results to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         env_vars: OS,NODE
+        token: ${{ secrets.CODECOV_TOKEN }}
 
     # - name: Bundle all packages
-    #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
+    #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
     #   run: npm i -g vsce && npm run package
 
     # - name: Archive all packages
-    #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
-    #   uses: actions/upload-artifact@v3
+    #   if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
+    #   uses: actions/upload-artifact@v4
     #   with:
     #     name: zowe-cics-client
     #     path: dist/*
@@ -104,14 +99,14 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
         persist-credentials: false
         ref: ${{ github.ref }}
 
     - name: Use Node.js LTS
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: lts/*
 
@@ -131,7 +126,7 @@ jobs:
     - name: Build Source
       run: npm run build
 
-    - uses: zowe-actions/octorelease@fix/allow-first-time-publish2
+    - uses: zowe-actions/octorelease@v1
       env:
         GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }}
         GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
@@ -140,5 +135,8 @@ jobs:
         NPM_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
         NPM_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
         NPM_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
+        NPM_TOKEN: ${{ secrets.VSCODE_NPM_PUBLISHER_TOKEN }}
+        OVSX_PAT: ${{ secrets.VSCODE_OVSX_PUBLISHER_TOKEN }}
+        VSCE_PAT: ${{ secrets.VSCODE_VSCE_PUBLISHER_TOKEN }}
       with:
         config-dir: .github
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           # General rules applied to both, issues and pull requests (PRs)
           days-before-close: 14

diff --git a/lerna.json b/lerna.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,14 @@
 {
     "name": "@zowe/cics_monorepo",
     "private": true,
+    "version": "5.0.3",
+    "publishConfig": {
+        "registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
+    },
+    "repository": "https://github.com/zowe/cics-for-zowe-client",
+    "workspaces": [
+        "./packages/*"
+    ],
     "scripts": {
         "build": "turbo build",
         "watch": "turbo watch",
@@ -13,10 +21,6 @@
         "prepare": "husky install",
         "license": "node scripts/updateLicenses.js"
     },
-    "repository": "https://github.com/zowe/cics-for-zowe-client",
-    "workspaces": [
-        "./packages/*"
-    ],
     "devDependencies": {
         "@types/glob": "^7.2.0",
         "@types/jest": "^29.5.0",
@@ -62,4 +66,4 @@
         "typescript": "^5.0.3",
         "uuid": "^9.0.0"
     }
-}
+}