Prep infra for v7 release (#2607)

mfedderly · web-flow · commit 1f39da5355cc · 2024-05-17T11:44:57.000-04:00
* Prep infra for v7 release

* Update workflow name

* Clarify release process instructions

* Move publish commands into workflow and out of package.json

* Prerelease version should include merged tags

* Update release procedure to reflect the user pushing the release tag

* Fix build

* Remove errant yml
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -41,6 +41,6 @@ jobs:
       - run: pnpm test
 
       - name: run publish
-        run: pnpm run publish:prerelease
+        run: lerna publish minor --canary --include-merged-tags --force-publish  --dist-tag prerelease --ignore-scripts true --yes
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,53 @@
+name: Publish release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    strategy:
+      fail-fast: true
+      matrix:
+        node:
+          - 18
+        platform:
+          - ubuntu-latest
+    name: "${{matrix.platform}} / Node.js ${{ matrix.node }}"
+    runs-on: ${{matrix.platform}}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v2.4.0
+        with:
+          version: 8
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: "https://registry.npmjs.org"
+          cache: "pnpm"
+
+      - run: npm whoami
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: pnpm test
+
+      - name: run publish
+        run: lerna publish from-package --ignore-scripts true --yes
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Create Github Release
+        uses: softprops/action-gh-release@v2
diff --git a/.github/workflows/turf.yml b/.github/workflows/turf.yml
@@ -1,4 +1,4 @@
-name: Turf.js CI
+name: CI build
 
 on:
   push:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -95,17 +95,11 @@ it will create a new folder inside `packages` with a simple boilerplate for your
 - The version number is calculated by a combination of the output of `git describe` and the `publish:prerelease` script in the root package.json. Specifically having `major` is appropriate for the pre-7.0 development phase, but we should change it to `minor` after 7.0.0 is finally released.
 
 ### Release
-- create new branch with some name
-- write up changelog changes (manually), commit that
-- make PR (don't merge)
-- pnpm lerna version --no-push 7.0.0
-- git push origin --follow-tags \$branch
-- merge PR (do not squash or the tags won't transfer)
-- re-fetch the new master and check it out locally
-- git clean -fdx (this will delete any unsaved local changes!)
-- pnpm install
-- pnpm test
-- pnpm publish -r
+- If necessary, make and merge a PR to contain any last minute changelog entries or other housekeeping items
+- Make a PR that contains the file changes from `pnpm lerna version --no-push 7.0.0` (update the version as necessary)
+- When pushing the release PR, use `--follow-tags` to make sure the relevant tag is also pushed
+- The CI will start doing the release when the tag is created
+- Don't forget to merge your PR
 
 ## Documentation
 
diff --git a/package.json b/package.json
@@ -13,7 +13,6 @@
     "lint:prettier": "prettier --check .",
     "preinstall": "npx only-allow pnpm",
     "prepare": "lerna run build && husky install",
-    "publish:prerelease": "lerna publish --force-publish --canary major --dist-tag prerelease --ignore-scripts true --yes",
     "test": "pnpm run lint && lerna run test && lerna run --scope @turf/turf last-checks"
   },
   "lint-staged": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Turf.js CI`
	`1`	`+name: CI build`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`