Update deps + switch to opam on CI

shakacode · Feb 26, 2024 · eb305ed · eb305ed
1 parent 8b31e42
commit eb305ed
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 210 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,13 +6,14 @@ on:
       - master
 
 jobs:
-  build:
+  build_macos:
     name: Build on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [macos-13, macos-14]
+        ocaml-version: [4.14.1]
         node-version: [16.x]
-        os: [macOS-latest, windows-latest]
 
     steps:
       - name: Checkout repo
@@ -25,7 +26,7 @@ jobs:
 
       - name: Print Yarn cache
         id: print-yarn-cache
-        run: echo "::set-output name=yarn-cache::$(yarn cache dir)"
+        run: echo "yarn-cache=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
       - name: Restore Yarn cache
         id: yarn-cache
@@ -37,25 +38,16 @@ jobs:
       - name: Install Yarn deps
         run: yarn install
 
-      - name: Install Esy
-        run: npm install -g [email protected]
-
-      - name: Install Esy deps
-        run: esy install
-
-      - name: Print Esy cache
-        id: print-esy-cache
-        run: node .github/workflows/scripts/print-esy-cache.js
-
-      - name: Restore Esy cache
-        id: esy-cache
-        uses: actions/cache@v1
+      - name: Setup OCaml ${{ matrix.ocaml-version}}
+        uses: ocaml/setup-ocaml@v2
         with:
-          path: ${{ steps.print-esy-cache.outputs.esy-cache }}
-          key: ${{ matrix.os }}-esy-${{ hashFiles('**/index.json') }}
+          ocaml-compiler: ${{ matrix.ocaml-version }}
+
+      - name: Install Opam deps
+        run: opam install . --deps-only --with-test
 
-      - name: Build ppx
-        run: esy build
+      - name: Build PPX
+        run: opam exec -- dune build
 
       - name: Build ReScript lib
         run: |
@@ -64,10 +56,8 @@ jobs:
           cd ../examples
           yarn run build
 
-      - name: Run ppx tests
-        # FIXME: Snapshot tests are broken on Win
-        if: matrix.os != 'windows-latest'
-        run: esy x test.exe
+      - name: Run PPX tests
+        run: opam exec -- dune exec test.exe
 
       - name: Run integration tests
         run: |
@@ -80,129 +70,129 @@ jobs:
           name: ${{ matrix.os }}
           path: _build/default/ppx/bin/bin.exe
 
-  build_linux:
-    name: Build on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-
-    container:
-      image: alexfedoseev/alpine-node-yarn-esy:0.0.10
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-
-      - name: Apply static linking patch
-        run: git apply linux.patch
-
-      - name: Print Yarn cache
-        id: print-yarn-cache
-        run: echo "::set-output name=yarn-cache::$(yarn cache dir)"
-
-      - name: Restore Yarn cache
-        id: yarn-cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.print-yarn-cache.outputs.yarn-cache }}
-          key: ${{ matrix.os }}-yarn-${{ hashFiles('yarn.lock') }}-v1
-
-      - name: Install Yarn deps
-        run: yarn install
-
-      - name: Install Esy deps
-        run: esy install
-
-      - name: Print Esy cache
-        id: print-esy-cache
-        run: node .github/workflows/scripts/print-esy-cache.js
-
-      - name: Restore Esy cache
-        id: esy-cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.print-esy-cache.outputs.esy-cache }}
-          key: ${{ matrix.os }}-esy-${{ hashFiles('esy.lock/index.json') }}
-
-      - name: Build ppx
-        run: esy build
-
-      - name: Build ReScript lib
-        run: |
-          cd lib
-          yarn run build
-          cd ../examples
-          yarn run build
-
-      - name: Run ppx tests
-        run: esy x test.exe
-
-      # FIXME: Integration tests are broken on Linux
-      # - name: Run integration tests
-      #   run: |
-      #     cd specs
-      #     yarn run test
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ matrix.os }}
-          path: _build/default/ppx/bin/bin.exe
-
-  rc:
-    needs:
-      - build
-      - build_linux
-    name: Prepare RC
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-
-      - name: Setup Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16.x
-
-      - name: Download Linux artifacts
-        uses: actions/download-artifact@v1
-        with:
-          name: ubuntu-latest
-          path: _bin/linux
-
-      - name: Download macOS artifacts
-        uses: actions/download-artifact@v1
-        with:
-          name: macOS-latest
-          path: _bin/darwin
-
-      - name: Download Windows artifacts
-        uses: actions/download-artifact@v1
-        with:
-          name: windows-latest
-          path: _bin/windows
-
-      - name: Move artifacts
-        run: |
-          mkdir -p _release/bin
-          mv _bin/darwin/bin.exe _release/bin/re-formality-ppx-darwin-x64.exe
-          mv _bin/windows/bin.exe _release/bin/re-formality-ppx-win-x64.exe
-          mv _bin/linux/bin.exe _release/bin/re-formality-ppx-linux-x64.exe
-          rm -rf _bin
-
-      - name: Move lib files
-        run: |
-          mkdir -p _release/src
-          cp README.md _release/README.md
-          cp lib/bsconfig.json _release/bsconfig.json
-          cp -a lib/src/. _release/src/
-          cp .github/workflows/scripts/postinstall.js _release/postinstall.js
-          node .github/workflows/scripts/write-package-json.js
-
-      - name: Upload release
-        uses: actions/upload-artifact@v1
-        with:
-          name: release
-          path: _release
+  # build_linux:
+  #   name: Build on ${{ matrix.os }}
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       os: [ubuntu-latest]
+  #
+  #   container:
+  #     image: alexfedoseev/alpine-node-yarn-esy:0.0.10
+  #
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@v2
+  #
+  #     - name: Apply static linking patch
+  #       run: git apply linux.patch
+  #
+  #     - name: Print Yarn cache
+  #       id: print-yarn-cache
+  #       run: echo "::set-output name=yarn-cache::$(yarn cache dir)"
+  #
+  #     - name: Restore Yarn cache
+  #       id: yarn-cache
+  #       uses: actions/cache@v1
+  #       with:
+  #         path: ${{ steps.print-yarn-cache.outputs.yarn-cache }}
+  #         key: ${{ matrix.os }}-yarn-${{ hashFiles('yarn.lock') }}-v1
+  #
+  #     - name: Install Yarn deps
+  #       run: yarn install
+  #
+  #     - name: Install Esy deps
+  #       run: esy install
+  #
+  #     - name: Print Esy cache
+  #       id: print-esy-cache
+  #       run: node .github/workflows/scripts/print-esy-cache.js
+  #
+  #     - name: Restore Esy cache
+  #       id: esy-cache
+  #       uses: actions/cache@v1
+  #       with:
+  #         path: ${{ steps.print-esy-cache.outputs.esy-cache }}
+  #         key: ${{ matrix.os }}-esy-${{ hashFiles('esy.lock/index.json') }}
+  #
+  #     - name: Build ppx
+  #       run: esy build
+  #
+  #     - name: Build ReScript lib
+  #       run: |
+  #         cd lib
+  #         yarn run build
+  #         cd ../examples
+  #         yarn run build
+  #
+  #     - name: Run ppx tests
+  #       run: esy x test.exe
+  #
+  #     # FIXME: Integration tests are broken on Linux
+  #     # - name: Run integration tests
+  #     #   run: |
+  #     #     cd specs
+  #     #     yarn run test
+  #
+  #     - name: Upload artifacts
+  #       uses: actions/upload-artifact@v1
+  #       with:
+  #         name: ${{ matrix.os }}
+  #         path: _build/default/ppx/bin/bin.exe
+  #
+  # rc:
+  #   needs:
+  #     - build
+  #     - build_linux
+  #   name: Prepare RC
+  #   runs-on: ubuntu-latest
+  #
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@v2
+  #
+  #     - name: Setup Node ${{ matrix.node-version }}
+  #       uses: actions/setup-node@v1
+  #       with:
+  #         node-version: 16.x
+  #
+  #     - name: Download Linux artifacts
+  #       uses: actions/download-artifact@v1
+  #       with:
+  #         name: ubuntu-latest
+  #         path: _bin/linux
+  #
+  #     - name: Download macOS artifacts
+  #       uses: actions/download-artifact@v1
+  #       with:
+  #         name: macOS-latest
+  #         path: _bin/darwin
+  #
+  #     - name: Download Windows artifacts
+  #       uses: actions/download-artifact@v1
+  #       with:
+  #         name: windows-latest
+  #         path: _bin/windows
+  #
+  #     - name: Move artifacts
+  #       run: |
+  #         mkdir -p _release/bin
+  #         mv _bin/darwin/bin.exe _release/bin/re-formality-ppx-darwin-x64.exe
+  #         mv _bin/windows/bin.exe _release/bin/re-formality-ppx-win-x64.exe
+  #         mv _bin/linux/bin.exe _release/bin/re-formality-ppx-linux-x64.exe
+  #         rm -rf _bin
+  #
+  #     - name: Move lib files
+  #       run: |
+  #         mkdir -p _release/src
+  #         cp README.md _release/README.md
+  #         cp lib/bsconfig.json _release/bsconfig.json
+  #         cp -a lib/src/. _release/src/
+  #         cp .github/workflows/scripts/postinstall.js _release/postinstall.js
+  #         node .github/workflows/scripts/write-package-json.js
+  #
+  #     - name: Upload release
+  #       uses: actions/upload-artifact@v1
+  #       with:
+  #         name: release
+  #         path: _release
diff --git a/.github/workflows/scripts/write-package-json.js b/.github/workflows/scripts/write-package-json.js
@@ -1,43 +1,26 @@
 const fs = require("fs");
 const path = require("path");
 
-const {
-  name,
-  version,
-  description,
-  author,
-  license,
-  repository,
-  keywords
-} = require("../../../package.json");
+const { name, version, description, author, license, repository, keywords } = require("../../../package.json");
 const { dependencies } = require("../../../lib/package.json");
 
 const packageJson = JSON.stringify(
-  {
-    name,
-    version,
-    description,
-    author,
-    license,
-    repository,
-    keywords,
-    dependencies,
-    files: [
-      "src",
-      "bin",
-      "bsconfig.json",
-      "postinstall.js",
-    ],
-    scripts: {
-      postinstall: "node ./postinstall.js"
-    }
-  },
-  null,
-  2
+    {
+        name,
+        version,
+        description,
+        author,
+        license,
+        repository,
+        keywords,
+        dependencies,
+        files: ["src", "bin", "rescript.json", "postinstall.js"],
+        scripts: {
+            postinstall: "node ./postinstall.js",
+        },
+    },
+    null,
+    2,
 );
 
-fs.writeFileSync(
-  path.join(__dirname, "..", "..", "..", "_release", "package.json"),
-  packageJson,
-  { encoding: "utf8" }
-);
+fs.writeFileSync(path.join(__dirname, "..", "..", "..", "_release", "package.json"), packageJson, { encoding: "utf8" });