upload platform artifacts

Author: cometkim

.github/workflows/ci.yml

@@ -438,7 +438,7 @@ jobs:
       - build-compiler
       - build-rewatch
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
@@ -447,29 +447,21 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          cache: yarn
           node-version-file: .nvmrc
 
-      - name: NPM install
-        run: yarn install
-
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
           pattern: "@(binaries-*|rewatch-*|lib-ocaml)"
 
-      - name: Move artifacts
-        run: ./scripts/moveArtifacts.sh
+      - name: Move artifacts into packages
+        run: .github/workflows/moveArtifacts.sh
 
-      - name: npm pack (rescript) + check artifact list
+      - name: Check artifact list
         run: node ./scripts/npmPack.js
 
-      - name: Copy JS files to stdlib package
-        run: mkdir -p packages/std/lib && cp -R lib/es6 lib/js packages/std/lib
-
-      - name: npm pack (@rescript/std)
-        run: npm pack
-        working-directory: packages/std
+      - name: yarn pack @rescript/* subpackages
+        run: yarn workspaces foreach -W --no-private --exclude rescript pack
 
       - name: Prepare package upload
         # For pull requests, pass the correct commit SHA explicitly as GITHUB_SHA points to the wrong commit.
@@ -482,6 +474,11 @@ jobs:
           path: |
             rescript-${{ env.rescript_version }}.tgz
             rescript-std-${{ env.rescript_version }}.tgz
+            rescript-linux-x64-${{ env.rescript_version }}.tgz
+            rescript-linux-arm64-${{ env.rescript_version }}.tgz
+            rescript-darwin-x64-${{ env.rescript_version }}.tgz
+            rescript-darwin-arm64-${{ env.rescript_version }}.tgz
+            rescript-win32-x64-${{ env.rescript_version }}.tgz
 
     outputs:
       rescript_version: ${{ env.rescript_version }}
@@ -491,15 +488,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [
-            macos-13, # x64
-            macos-14, # ARM
-            ubuntu-24.04,
-            ubuntu-24.04-arm,
-            windows-latest,
-          ]
+        include:
+          - os: macos-13 # x64
+            target: darwin-x64
+          - os: macos-14 # ARM
+            target: darwin-arm64
+          - os: ubuntu-24.04
+            target: linux-x64
+          - os: ubuntu-24.04-arm
+            target: linux-arm64
+          - os: windows-latest
+            target: win32-x64
 
-    runs-on: ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
@@ -532,7 +533,8 @@ jobs:
       - name: Install ReScript package
         run: |
           npm i --ignore-scripts --no-audit \
-            rescript-${{ needs.package.outputs.rescript_version }}.tgz
+            rescript-${{ needs.package.outputs.rescript_version }}.tgz \
+            rescript-${{ matrix.target }}-${{ env.rescript_version }}.tgz
         shell: bash
         working-directory: ${{ steps.tmp-dir.outputs.path }}
 
@@ -546,7 +548,7 @@ jobs:
 
     if: startsWith(github.ref, 'refs/tags/v')
 
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
@@ -568,8 +570,13 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
         run: |
-          npm publish rescript-${{ needs.package.outputs.rescript_version }}.tgz --tag ci
-          npm publish rescript-std-${{ needs.package.outputs.rescript_version }}.tgz --tag ci
+          npm publish --tag ci rescript-${{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-std-${{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-linux-x64-${{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-linux-arm64-${{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-darwin-x64-${{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-darwin-arm64-{{ needs.package.outputs.rescript_version }}.tgz
+          npm publish --tag ci rescript-win32-x64-${{ needs.package.outputs.rescript_version }}.tgz
 
       - name: Update Website Playground
         env:

scripts/moveArtifacts.sh renamed to .github/workflows/moveArtifacts.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 set -e
 
 check_statically_linked() {
@@ -24,18 +25,19 @@ check_statically_linked() {
     fi
 }
 
-chmod +x binaries-*/*.exe rewatch-*/*.exe
-
-mkdir darwin darwinarm64 linux linuxarm64 win32
-
-mv binaries-darwin/* rewatch-darwin/* darwin
-mv binaries-darwinarm64/* rewatch-darwinarm64/* darwinarm64
-mv binaries-linux/* rewatch-linux/* linux
-mv binaries-linuxarm64/* rewatch-linuxarm64/* linuxarm64
-mv binaries-win32/* rewatch-win32/* win32
-
+# rescript
 mv lib-ocaml lib/ocaml
-mv ninja/COPYING ninja.COPYING
 
-check_statically_linked "linux"
-check_statically_linked "linuxarm64"
+# @rescript/{target}
+chmod +x binaries-*/*.exe rewatch-*/*.exe
+mv -f binaries-darwin/* rewatch-darwin/*           packages/@rescript/darwin-x64/bin
+mv -f binaries-darwinarm64/* rewatch-darwinarm64/* packages/@rescript/darwin-arm64/bin
+mv -f binaries-linux/* rewatch-linux/*             packages/@rescript/linux-x64/bin
+mv -f binaries-linuxarm64/* rewatch-linuxarm64/*   packages/@rescript/linux-arm64/bin
+mv -f binaries-win32/* rewatch-win32/*             packages/@rescript/win32-x64/bin
+check_statically_linked "packages/@rescript/linux-x64/bin"
+check_statically_linked "packages/@rescript/linux-arm64/bin"
+
+# @rescript/std
+mkdir -p packages/std/lib
+cp -R lib/es6 lib/js packages/std/lib

.github/workflows/prepare_package_upload.js

@@ -10,15 +10,40 @@ const { version } = packageSpec;
 const commitHash = process.argv[2] || process.env.GITHUB_SHA;
 const commitHashShort = commitHash.substring(0, 7);
 
+// rescript
 fs.renameSync(
-  `rescript-${version}.tgz`,
+  "package.tgz",
   `rescript-${version}-${commitHashShort}.tgz`,
 );
+
+// @rescript/std
 fs.renameSync(
-  `packages/std/rescript-std-${version}.tgz`,
+  "packages/@rescript/std/package.tgz",
   `rescript-std-${version}-${commitHashShort}.tgz`,
 );
 
+// @rescript/{target}
+fs.renameSync(
+  "packages/@rescript/linux-x64/package.tgz",
+  `rescript-linux-x64-${version}-${commitHashShort}.tgz`,
+);
+fs.renameSync(
+  "packages/@rescript/linux-arm64/package.tgz",
+  `rescript-linux-arm64-${version}-${commitHashShort}.tgz`,
+);
+fs.renameSync(
+  "packages/@rescript/darwin-x64/package.tgz",
+  `rescript-darwin-x64-${version}-${commitHashShort}.tgz`,
+);
+fs.renameSync(
+  "packages/@rescript/darwin-arm64/package.tgz",
+  `rescript-darwin-arm64-${version}-${commitHashShort}.tgz`,
+);
+fs.renameSync(
+  "packages/@rescript/win32-x64/package.tgz",
+  `rescript-win32-x64-${version}-${commitHashShort}.tgz`,
+);
+
 // Pass information to subsequent GitHub actions
 fs.appendFileSync(
   process.env.GITHUB_ENV,

.gitignore

@@ -95,3 +95,6 @@ tests/analysis_tests/**/*.bs.js
 !.yarn/versions
 
 *.tsbuildinfo
+
+# package tarballs
+package.tgz