From d56c3348408bdfa4a2ca3689e6247a058306f268 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Thu, 1 Feb 2024 22:22:03 +0000 Subject: [PATCH] allow independent versioning Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .github/release.config.js | 2 ++ .github/workflows/main.yml | 2 +- packages/vsce/package.json | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/release.config.js b/.github/release.config.js index 82f4e920..330f16f8 100644 --- a/.github/release.config.js +++ b/.github/release.config.js @@ -47,6 +47,7 @@ module.exports = { pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"], // Use Lerna only for versioning and publish packages independently npmPublish: false, + versionIndependent: ["cics-extension-for-zowe"] }, ], [ @@ -81,6 +82,7 @@ module.exports = { "@octorelease/github", { assets: ["dist/*.tgz", "dist/*.vsix"], + checkPrLabels: true, draftRelease: true, }, ], diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1bedf0e..c8432570 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: - name: Build Source run: npm run build - - uses: zowe-actions/octorelease@fix/allow-first-time-publish + - uses: zowe-actions/octorelease@v1 env: GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }} GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }} diff --git a/packages/vsce/package.json b/packages/vsce/package.json index bdf85d3c..145aa34f 100644 --- a/packages/vsce/package.json +++ b/packages/vsce/package.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/zowe/cics-for-zowe-client.git" }, - "version": "5.0.2", + "version": "2.3.2", "engines": { "vscode": "^1.53.2" }, @@ -871,7 +871,7 @@ } }, "scripts": { - "vscode:prepublish": "tsup", + "vscode:prepublish": "npm run tsupDep -- add && tsup && npm run tsupDep", "build": "tsup && npm run checkTestsCompile && npm run madge", "checkTestsCompile": "echo \"Checking that test source compiles...\" && tsc --project __tests__/test-tsconfig.json --noEmit ", "madge": "echo 'Nothing to check'", @@ -883,7 +883,7 @@ "test:unit": "jest --config unit.jest_config.ts --no-coverage", "test": "npm run test:unit", "tsupDep": "node ./scripts/tsup-deps.js", - "package": "npm run tsupDep -- add && vsce package --dependencies --allow-star-activation && node ../../scripts/mv-pack.js cics-extension-for-zowe vsix && npm run tsupDep" + "package": "vsce package --dependencies --allow-star-activation && node ../../scripts/mv-pack.js cics-extension-for-zowe vsix" }, "devDependencies": { "@types/vscode": "~1.53.0",