From bb3a1e907f027d2f5df0d857e134f851e67f5b1b Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Mon, 4 Sep 2023 17:04:22 +0200 Subject: [PATCH 1/6] Adapted npm script and actions CI to publish language-extensions automatically --- .github/workflows/release.yml | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 904eae1b0..a86d3ed18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,3 +21,5 @@ jobs: - run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} + - run: cd language-extensions + - run: npm publish diff --git a/package.json b/package.json index 8cda09ba3..769fa2e12 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "fix:prettier": "prettier --write .", "check:language-extensions": "tsc --strict language-extensions/index.d.ts", "preversion": "npm run build && npm test", - "postversion": "git push && git push --tags" + "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION && git push && git push --tags" }, "bin": { "tstl": "dist/tstl.js" From 3c4c2466ad88e422719c3c9461f7c08bd1483386 Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Mon, 4 Sep 2023 17:08:38 +0200 Subject: [PATCH 2/6] Removed redundant git push --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 769fa2e12..687c01730 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "fix:prettier": "prettier --write .", "check:language-extensions": "tsc --strict language-extensions/index.d.ts", "preversion": "npm run build && npm test", - "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION && git push && git push --tags" + "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION" }, "bin": { "tstl": "dist/tstl.js" From 22ff2ec68a9a238284cff173cdb8e8059d2d412d Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Mon, 4 Sep 2023 17:10:24 +0200 Subject: [PATCH 3/6] cd pack after script completion --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 687c01730..7a328e822 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "fix:prettier": "prettier --write .", "check:language-extensions": "tsc --strict language-extensions/index.d.ts", "preversion": "npm run build && npm test", - "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION" + "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION && cd .." }, "bin": { "tstl": "dist/tstl.js" From 8245a2baca503ea6ee1a8bbd83dabce9f127da64 Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Mon, 4 Sep 2023 17:14:19 +0200 Subject: [PATCH 4/6] Added token to second publish --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a86d3ed18..dc4f1e62b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,3 +23,5 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} - run: cd language-extensions - run: npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} From 5d8f38d4b68cdb2814f626e24aaaa563e4c7fa0a Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Thu, 7 Sep 2023 11:32:32 +0200 Subject: [PATCH 5/6] Make sure commit is not tagged twice --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a328e822..e92e62c1a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "fix:prettier": "prettier --write .", "check:language-extensions": "tsc --strict language-extensions/index.d.ts", "preversion": "npm run build && npm test", - "postversion": "git push && git push --tags && NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION && cd .." + "postversion": "NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION --no-git-tag-version && cd .. && git push && git push --tags" }, "bin": { "tstl": "dist/tstl.js" From 33f60d1863ec36e8a08bdbbd62207458bf136b04 Mon Sep 17 00:00:00 2001 From: Lorenz Junglas Date: Thu, 7 Sep 2023 12:09:34 +0200 Subject: [PATCH 6/6] Cross platform solution using JS script --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e92e62c1a..65e1b1059 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,8 @@ "fix:prettier": "prettier --write .", "check:language-extensions": "tsc --strict language-extensions/index.d.ts", "preversion": "npm run build && npm test", - "postversion": "NEW_VERSION=$(npm pkg get version --workspaces=false | tr -d \") && cd language-extensions && npm version $NEW_VERSION --no-git-tag-version && cd .. && git push && git push --tags" + "postversion": "npm run syncversions && git push && git push --tags", + "syncversions": "cd language-extensions && node -e \"require('child_process').exec(\\`npm version \\${require('../package.json').version} --no-git-tag-version\\`)\" && cd .." }, "bin": { "tstl": "dist/tstl.js"