fix: release mechanism with Lerna

jankarres · jankarres · commit af78bd121995 · 2025-11-09T17:49:07.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,6 +61,7 @@ jobs:
         name: LAME install on ${{ matrix.os }}
         runs-on: ${{ matrix.os }}
         needs: quality
+        if: github.ref_name != 'master'
         strategy:
             fail-fast: false
             matrix:
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -37,18 +37,6 @@ jobs:
           LAME_SKIP_DOWNLOAD: "1"
         run: pnpm install --frozen-lockfile
 
-      - name: Lint
-        run: pnpm run lint
-
-      - name: Typecheck
-        run: pnpm run typecheck
-
-      - name: Unit tests
-        run: pnpm run test:unit
-
-      - name: Integration tests
-        run: pnpm run test:integration
-
       - name: Determine changelog mode
         id: changelog
         run: |
@@ -72,6 +60,7 @@ jobs:
           SKIP_CHANGELOG: ${{ steps.changelog.outputs.skip }}
         run: |
           set -eo pipefail
+          git checkout -B master ${{ github.event.workflow_run.head_commit.id }}
           pnpm run release:version > version.log 2>&1 || STATUS=$?
           cat version.log
           if [ -n "$STATUS" ]; then
@@ -88,4 +77,4 @@ jobs:
         if: steps.version.outputs.skip != 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: git push --follow-tags
+        run: git push --set-upstream origin master --follow-tags
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,74 +2,13 @@ name: Release
 
 on:
     workflow_run:
-        workflows: ["CI"]
+        workflows: ["Prepare Release"]
         types:
             - completed
 
 jobs:
-    build-binaries:
-        if: >
-            github.event.workflow_run.conclusion == 'success' &&
-            github.event.workflow_run.head_branch == 'master' &&
-            startsWith(github.event.workflow_run.head_commit.message, 'chore(release)')
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                include:
-                    - platform: linux
-                      arch: x64
-                      binary: vendor/lame/linux-x64/lame
-                    - platform: darwin
-                      arch: arm64
-                      binary: vendor/lame/darwin-arm64/lame
-                    - platform: win32
-                      arch: x64
-                      binary: vendor/lame/win32-x64/lame.exe
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  repository: ${{ github.event.workflow_run.head_repository.full_name }}
-                  ref: ${{ github.event.workflow_run.head_commit.id }}
-                  fetch-depth: 0
-
-            - name: Setup pnpm
-              uses: pnpm/action-setup@v4
-
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 20.x
-                  cache: pnpm
-
-            - name: Install dependencies
-              env:
-                  LAME_SKIP_DOWNLOAD: "1"
-              run: pnpm install --frozen-lockfile
-
-            - name: Download LAME binary for ${{ matrix.platform }}-${{ matrix.arch }}
-              env:
-                  NODE_LAME_PLATFORM: ${{ matrix.platform }}
-                  NODE_LAME_ARCH: ${{ matrix.arch }}
-                  LAME_FORCE_DOWNLOAD: "1"
-              run: node scripts/install-lame.mjs
-
-            - name: Package binary
-              run: node scripts/package-lame.mjs --binary "${{ matrix.binary }}" --platform "${{ matrix.platform }}" --arch "${{ matrix.arch }}" --out-dir artifacts
-
-            - name: Upload artifacts
-              uses: actions/upload-artifact@v4
-              with:
-                  name: lame-${{ matrix.platform }}-${{ matrix.arch }}
-                  path: artifacts
-
     publish:
-        needs: build-binaries
-        if: >
-            github.event.workflow_run.conclusion == 'success' &&
-            github.event.workflow_run.head_branch == 'master' &&
-            startsWith(github.event.workflow_run.head_commit.message, 'chore(release)')
+        if: github.event.workflow_run.conclusion == 'success'
         runs-on: ubuntu-latest
         permissions:
             contents: write
@@ -82,6 +21,18 @@ jobs:
                   ref: ${{ github.event.workflow_run.head_commit.id }}
                   fetch-depth: 0
 
+            - name: Checkout latest tag
+              run: |
+                  set -eo pipefail
+                  git fetch --force --tags
+                  LATEST_TAG=$(git for-each-ref --sort=-creatordate --format '%(refname:short)' refs/tags | head -n 1)
+                  if [ -z "$LATEST_TAG" ]; then
+                      echo "No tags available to release."
+                      exit 1
+                  fi
+                  git checkout "$LATEST_TAG"
+                  echo "RELEASE_TAG=$LATEST_TAG" >> "$GITHUB_ENV"
+
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
 
@@ -95,49 +46,11 @@ jobs:
             - name: Install dependencies
               run: pnpm install --frozen-lockfile
 
-            - name: Download artifacts
-              uses: actions/download-artifact@v4
-              with:
-                  path: artifacts
-
-            - name: Unpack binaries into vendor directory
-              run: node scripts/unpack-lame-artifacts.mjs artifacts vendor/lame
-
             - name: Build package
               run: pnpm run build
 
-            - name: Prepare release assets
-              run: |
-                  set -eo pipefail
-                  VERSION=$(node -p "require('./package.json').version")
-                  ASSET_DIR="$PWD/release-assets"
-                  mkdir -p "$ASSET_DIR"
-                  while IFS= read -r manifest; do
-                      base=$(basename "$manifest" .json)
-                      src_dir="vendor/lame/$base"
-                      if [ ! -d "$src_dir" ]; then
-                          echo "Skipping $base - no vendor directory"
-                          continue
-                      fi
-                      tmp_dir=$(mktemp -d)
-                      cp "$src_dir"/* "$tmp_dir/"
-                      cp "$manifest" "$tmp_dir/manifest.json"
-                      (cd "$tmp_dir" && zip -qr "$ASSET_DIR/node-lame-v${VERSION}-${base}.zip" .)
-                      rm -rf "$tmp_dir"
-                  done < <(find artifacts -maxdepth 3 -name '*.json')
-                  zip -qr "$ASSET_DIR/node-lame-v${VERSION}-dist.zip" dist
-
-            - name: Publish release
+            - name: Publish package
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
                   NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: pnpm run release:publish
-
-            - name: Upload assets to GitHub release
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  VERSION=$(node -p "require('./package.json').version")
-                  TAG="v${VERSION}"
-                  gh release upload "$TAG" release-assets/*.zip --clobber
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
   ],
   "dependencies": {
     "extract-zip": "~2.0.1",
-    "tar": "~7.5.1"
+    "tar": "~7.5.2"
   },
   "devDependencies": {
     "@commitlint/cli": "~20.1.0",
@@ -79,7 +79,7 @@
     "@typescript-eslint/eslint-plugin": "~8.46.2",
     "@typescript-eslint/parser": "~8.46.2",
     "@vitest/coverage-istanbul": "~4.0.4",
-    "conventional-changelog-cli": "^5.0.0",
+    "conventional-changelog-cli": "~5.0.0",
     "conventional-changelog-conventionalcommits": "~9.1.0",
     "conventional-recommended-bump": "~11.2.0",
     "eslint": "~9.38.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/release-version.mjs b/scripts/release-version.mjs
@@ -5,6 +5,10 @@ const skipChangelog = process.env.SKIP_CHANGELOG === "1";
 const packageJson = JSON.parse(
     readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
 );
+const semverModule = await import("semver");
+const semver = semverModule.default ?? semverModule;
+const targetVersion = "2.0.0";
+const isBeforeTarget = semver.lt(packageJson.version, targetVersion);
 
 const runCommand = (args) => {
     const result = spawnSync("pnpm", args, {
@@ -21,33 +25,39 @@ const runCommand = (args) => {
 };
 
 if (skipChangelog) {
-    const [{ default: conventionalRecommendedBump }, semver] = await Promise.all(
-        [
-            import("conventional-recommended-bump"),
-            import("semver"),
-        ],
-    );
+    let releaseType = "patch";
 
-    const releaseType = await new Promise((resolve, reject) => {
-        conventionalRecommendedBump(
-            { preset: "conventionalcommits" },
-            (error, recommendation) => {
-                if (error) {
-                    reject(error);
-                    return;
-                }
+    try {
+        const module = await import("conventional-recommended-bump");
+        const candidate =
+            typeof module.default === "function"
+                ? module.default
+                : undefined;
 
-                resolve(recommendation.releaseType ?? "patch");
-            },
+        if (candidate) {
+            const recommendation = await candidate({
+                preset: "conventionalcommits",
+            });
+            releaseType = recommendation?.releaseType ?? "patch";
+        } else {
+            console.warn(
+                "[release] conventional-recommended-bump did not expose a callable default export. Defaulting to patch bump.",
+            );
+        }
+    } catch (error) {
+        console.warn(
+            `[release] Failed to determine recommended bump (${error.message}). Defaulting to patch.`,
         );
-    });
+    }
 
-    const nextVersion = semver.inc(
-        packageJson.version,
-        releaseType ?? "patch",
-    );
-    if (!nextVersion) {
-        throw new Error("Unable to determine next version for release.");
+    let nextVersion =
+        semver.inc(packageJson.version, releaseType) ?? targetVersion;
+
+    if (isBeforeTarget && semver.lt(nextVersion, targetVersion)) {
+        console.log(
+            `[release] Forcing version to ${targetVersion} to begin the 2.x line.`,
+        );
+        nextVersion = targetVersion;
     }
 
     console.log(
@@ -60,18 +70,32 @@ if (skipChangelog) {
         nextVersion,
         "--yes",
         "--no-commit-hooks",
-        "--no-changelog",
-        "--no-conventional-commits",
+        "--conventional-commits",
+        "--no-push",
     ]);
 } else {
     console.log(
         "[release] Using Conventional Commits to generate the changelog.",
     );
 
-    runCommand([
-        "lerna",
-        "version",
-        "--yes",
-        "--no-commit-hooks",
-    ]);
+    if (isBeforeTarget) {
+        console.log(
+            `[release] Forcing version to ${targetVersion} to begin the 2.x line.`,
+        );
+        runCommand([
+            "lerna",
+            "version",
+            targetVersion,
+            "--yes",
+            "--no-commit-hooks",
+            "--conventional-commits",
+        ]);
+    } else {
+        runCommand([
+            "lerna",
+            "version",
+            "--yes",
+            "--no-commit-hooks",
+        ]);
+    }
 }
diff --git a/scripts/unpack-lame-artifacts.mjs b/scripts/unpack-lame-artifacts.mjs
