diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 12f0b5ff..30e92210 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,7 @@ jobs: - name: Update Dependencies id: npm-update - uses: zowe-actions/octorelease/script@reg-config + uses: zowe-actions/octorelease/script@v1 with: config-dir: .github script: npmUpdate @@ -114,7 +114,7 @@ jobs: run: npm ci - name: Update Dependencies - uses: zowe-actions/octorelease/script@reg-config + uses: zowe-actions/octorelease/script@v1 env: GIT_COMMITTER_NAME: zowe_robot GIT_COMMITTER_EMAIL: zowe.robot@gmail.com @@ -126,7 +126,7 @@ jobs: - name: Build Source run: npm run build - - uses: zowe-actions/octorelease@reg-config + - uses: zowe-actions/octorelease@v1 env: GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }} GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }} diff --git a/scripts/bundleTgz.js b/scripts/bundleTgz.js index 840679d6..0a1ada83 100644 --- a/scripts/bundleTgz.js +++ b/scripts/bundleTgz.js @@ -50,8 +50,12 @@ fsE.copyFileSync(pkgJsonFile, pkgJsonFile + ".bak"); try { // Install node_modules directly inside packages/cli execCmd("npm run preshrinkwrap"); - - execCmd(`${npmInstallCmd} ${path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + tempPkgJson.version + ".tgz")}`); + try { + execCmd(`npm view @zowe/cics-for-zowe-sdk`); + } catch (err) { + const sdkTgzPath = path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + tempPkgJson.version + ".tgz"); + execCmd(`${npmInstallCmd} ${sdkTgzPath}`); + } execCmd(npmInstallCmd); for (const zowePkgDir of fsE.readdirSync(path.join(cliPkgDir, "node_modules", "@zowe"))) { const srcDir = path.join("node_modules", "@zowe", zowePkgDir);