CI: split binaries into separate packages (#43)

emmercm · Sep 21, 2024 · 9483ac9 · 9483ac9
1 parent c495221
commit 9483ac9
Show file tree

Hide file tree

Showing 75 changed files with 9,511 additions and 3,593 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -20,7 +20,9 @@
     "project": "./tsconfig.json",
     "sourceType": "module"
   },
-  "ignorePatterns": ["dist/**"],
+  "ignorePatterns": [
+    "packages/*/dist/**"
+  ],
 
   "env": {
     "jest/globals": true

diff --git a/.github/workflows/gh-release-drafter.yml b/.github/workflows/gh-release-drafter.yml
@@ -51,7 +51,7 @@ jobs:
       - if: steps.check.outputs.changed == 'true'
         uses: volta-cli/action@v4
       - if: steps.check.outputs.changed == 'true'
-        run: npm ci
+        run: npm ci --force
 
       # Generate the release's markdown template
       - if: steps.check.outputs.changed == 'true'

diff --git a/.github/workflows/gh-repo-update.yml b/.github/workflows/gh-repo-update.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          DATA=$(jq --raw-output --compact-output '{description: .description, homepage: .homepage}' package.json)
+          DATA=$(jq --raw-output --compact-output '{description: .description, homepage: .homepage}' packages/chdman/package.json)
           curl \
             --fail-with-body \
             -X PATCH \
@@ -32,7 +32,7 @@ jobs:
         env:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
       - run: |
-          DATA=$(jq --raw-output --compact-output '{names: .keywords}' package.json)
+          DATA=$(jq --raw-output --compact-output '{names: .keywords}' packages/chdman/package.json)
           curl \
             --fail-with-body \
             -X PUT \

diff --git a/.github/workflows/mame-build.yml b/.github/workflows/mame-build.yml
@@ -99,7 +99,7 @@ jobs:
           ls -al chdman
       - name: Rename binary
         run: |
-          dir="artifacts/bin/linux/${{ matrix.nodejs_arch }}"
+          dir="artifacts/packages/chdman-linux-${{ matrix.nodejs_arch }}"
           mkdir -p "${dir}"
           mv chdman "${dir}/"
       - uses: actions/upload-artifact@v4
@@ -136,7 +136,7 @@ jobs:
       - name: Rename binary
         run: |
           # shellcheck disable=SC2016
-          dir="artifacts/bin/$(node --eval 'console.log(`${process.platform}/${process.arch}`)')"
+          dir="artifacts/packages/chdman-$(node --eval 'console.log(`${process.platform}-${process.arch}`)')"
           mkdir -p "${dir}"
           mv chdman "${dir}/"
       - uses: actions/upload-artifact@v4
@@ -197,7 +197,7 @@ jobs:
           ls -al chdman.exe
       - name: Rename binary
         run: |
-          dir="artifacts/bin/win32/${{ matrix.nodejs_arch }}"
+          dir="artifacts/packages/chdman-win32-${{ matrix.nodejs_arch }}"
           mkdir -p "${dir}"
           mv chdman.exe "${dir}/"
       - uses: actions/upload-artifact@v4
@@ -232,11 +232,11 @@ jobs:
           else
             new_version="${major_version}.${minor_version}.0"
           fi
-          npm version "${new_version}" --no-git-tag-version || true
+          lerna version "${new_version}" --yes || true
 
-          chmod +x bin/**/*
+          chmod +x packages/chdman-*-*/chdman*
           ls -alR
-          git add package*.json bin
+          git add package*.json lerna.json packages
 
           USER_EMAIL="${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
           echo "USER_EMAIL=${USER_EMAIL}" >> "${GITHUB_OUTPUT}"

diff --git a/.github/workflows/node-publish.yml b/.github/workflows/node-publish.yml
@@ -24,13 +24,13 @@ jobs:
       - uses: volta-cli/action@v4
         with:
           registry-url: 'https://registry.npmjs.org'
-      - run: npm ci
+      - run: npm ci --force
       - id: publish
         name: npm publish
         run: |
           set -x
           npm whoami
-          npm publish
+          lerna publish from-package --yes
           {
             echo "PACKAGE_NAME=$(jq --raw-output '.name' package.json)"
             echo "PACKAGE_VERSION=$(jq --raw-output '.version' package.json)"

diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
@@ -27,9 +27,9 @@ jobs:
           filters: |
             changes:
               - '.github/workflows/node-test.yml'
-              - 'bin/**'
-              - 'src/**'
-              - 'test/**'
+              - 'packages/*/src/**'
+              - 'packages/*/test/**'
+              - 'packages/chdman-*-*/**'
               - '*'
 
   node-lint:
@@ -41,7 +41,7 @@ jobs:
       # Setup and install
       - uses: actions/checkout@v4
       - uses: volta-cli/action@v4
-      - run: npm ci
+      - run: npm ci --force
       # Lint the source files
       - run: npm run lint
 
@@ -51,16 +51,20 @@ jobs:
     if: ${{ needs.path-filter.outputs.changes == 'true' }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-13, macos-14, windows-latest ]
-        node-version: [ lts, 16.6.0 ]
+        node-version:
+          - lts
+          # Using this instead of v16.6.0 to get npm v8.1+ to fix workspace issues
+          - 16.12.0
     steps:
       # Setup and install
       - uses: actions/checkout@v4
       - uses: volta-cli/action@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - run: npm ci
+      - run: npm ci --force
       - if: ${{ startsWith(matrix.os, 'ubuntu') }}
         run: |
           sudo apt-get update
@@ -71,14 +75,14 @@ jobs:
       # Test the source files
       - run: npm run test:unit
 
-      # Test building
-      - run: npm run build
-
       # Test running
       - run: |
-          npm start -- help
-          npm start -- createcd --input test/fixtures/cue/multiple.cue --output multiple.chd --hunksize 14688
-          npm start -- info --input multiple.chd
+          npm start --workspace=packages/chdman -- help
+          npm start --workspace=packages/chdman -- createcd --input test/fixtures/cue/multiple.cue --output multiple.chd --hunksize 14688
+          npm start --workspace=packages/chdman -- info --input multiple.chd
+
+      # Test building
+      - run: npm run build
 
   # !!! This check should be required by GitHub !!!
   test-status-check:

diff --git a/.github/workflows/node-version-bump.yml b/.github/workflows/node-version-bump.yml
@@ -29,12 +29,16 @@ jobs:
       # Setup and install
       - uses: actions/checkout@v4
       - uses: volta-cli/action@v4
-      - run: npm ci
+      - run: npm ci --force
 
       # Bump the version and commit to the default branch
       - id: bump-and-commit
         run: |
           npm run "bump:${{ inputs.increment }}"
+          for PACKAGE in packages/chdman-*; do
+            # shellcheck disable=SC2005
+            echo "$(jq '. + (input|{description,keywords,homepage,bugs,license,author,funding,repository})' "${PACKAGE}/package.json" packages/chdman/package.json)" > "${PACKAGE}/package.json"
+          done
           git add --all
 
           USER_EMAIL="${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
@@ -45,7 +49,7 @@ jobs:
           echo "USER_NAME=${USER_NAME}" >> "${GITHUB_OUTPUT}"
           git config --global user.name "${USER_NAME}"
 
-          PACKAGE_VERSION="$(jq --raw-output '.version' package.json)"
+          PACKAGE_VERSION="$(jq --raw-output '.version' packages/chdman/package.json)"
           echo "PACKAGE_VERSION=${PACKAGE_VERSION}" >> "${GITHUB_OUTPUT}"
           git commit -m "v${PACKAGE_VERSION}"
         env:

diff --git a/.gitignore b/.gitignore
@@ -106,3 +106,8 @@ dist
 
 # Custom
 *.chd
+.nx/
+packages/*/dist/
+packages/*/test/fixtures/*/build/
+packages/*/junit.xml
+packages/*/LICENSE
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 | OS                     | Architectures                                                                 | Additional Instructions                                                                                                                                                                               |
 |------------------------|-------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Windows](./bin/win32) | <ul><li>x64</li><li>x86</li></ul>                                             |                                                                                                                                                                                                       |
-| [macOS](./bin/darwin)  | <ul><li>arm64 (Apple Silicon)</li><li>x64 (Intel)</li></ul>                   | [SDL2](https://www.libsdl.org/) is required to be installed separately:</li><pre>brew install sdl2</pre>                                                                                              |
+| [macOS](./bin/darwin)  | <ul><li>arm64 (Apple Silicon)</li><li>x64 (Intel)</li></ul>                   | [SDL2](https://www.libsdl.org/) is required to be installed separately:<pre>brew install sdl2</pre>                                                                                                   |
 | [Linux](./bin/linux)   | <ul><li>x64</li><li>x86</li><li>arm (armhf)</li><li>arm64 (aarch64)</li></ul> | [SDL2](https://www.libsdl.org/) is required to be installed separately:<ul><li>Debian: `apt-get install libsdl2-2.0-0`</li><li>Gentoo: `emerge libsdl2`</li><li>Red Hat: `dnf install SDL2`</li></ul> |
 
 ## Running

diff --git a/lerna.json b/lerna.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
+  "version": "0.269.0",
+  "packages": [
+    "packages/*"
+  ],
+  "command": {
+    "version": {
+      "changelog": false,
+      "gitTagVersion": false,
+      "push": false,
+      "npmClientArgs": [
+        "--force"
+      ]
+    },
+    "publish": {
+      "throttle": true
+    }
+  }
+}