Revert to yarn

ranisalt · Dec 9, 2023 · 1f7d7d3 · 1f7d7d3
1 parent 434e208
commit 1f7d7d3
Show file tree

Hide file tree

Showing 6 changed files with 1,346 additions and 2,153 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,54 +3,66 @@ name: CI
 on: [push, pull_request]
 
 env:
+  YARN_GPG: no
   npm_config_debug: yes
   npm_config_build_from_source: true
 
 jobs:
   test:
-    name: Test for node-${{ matrix.node-version }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         node-version: [18, 20]
         os: [ubuntu-20.04, macos-11, macos-m1, windows-2019]
 
+    name: Test for node-${{ matrix.node-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: actions/setup-node@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
       with:
+        cache: yarn
         node-version: ${{ matrix.node-version }}
 
-    - run: corepack enable
-    - run: pnpm install --frozen-lockfile
-    - run: pnpm test
+    - name: Install dependencies
+      run: yarn install
+
+    - name: Run tests
+      run: yarn test
 
   test-alpine:
-    name: Test for node-${{ matrix.node-version }} on Alpine Linux
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [18, 20]
 
+    name: Test for node-${{ matrix.node-version }} on Alpine Linux
+    runs-on: ubuntu-latest
+
     container:
       image: node:${{ matrix.node-version }}-alpine
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/setup-node@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
         with:
+          cache: yarn
           node-version: ${{ matrix.node-version }}
 
-      - run: corepack enable
-      - run: apk add make g++ python3 git
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm test
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Run tests
+        run: yarn test
 
   test-freebsd:
     strategy:
@@ -61,17 +73,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - uses: vmactions/freebsd-vm@v1
         with:
-          envs: 'npm_config_debug npm_config_build_from_source'
+          envs: 'YARN_GPG npm_config_debug npm_config_build_from_source'
           prepare: |
-            pkg install -y gmake python3 node${{ matrix.node-version }}
-            corepack enable
+            pkg install -y gmake python3 yarn-node${{ matrix.node-version }}
           run: |
-            pnpm install --frozen-lockfile
-            pnpm test
+            yarn install
+            yarn test
           sync: sshfs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,45 +13,54 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: actions/setup-node@v4
+    - name: Use Node.js 18
+      uses: actions/setup-node@v4
       with:
+        cache: yarn
         node-version: 18
 
-    - run: corepack enable
-    - run: pnpm install --frozen-lockfile
+    - name: Install dependencies
+      run: yarn install
 
-    - run: pnpm publish
+    - name: Publish to NPM
+      run: yarn publish
       if: ${{ !env.ACT }}
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   build:
-    name: Build on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-11, macos-m1, windows-2019]
 
+    name: Build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: actions/setup-node@v4
+    - name: Use Node.js 18
+      uses: actions/setup-node@v4
       with:
+        cache: yarn
         node-version: 18
 
-    - run: corepack enable
-    - run: pnpm install --frozen-lockfile
+    - name: Install dependencies
+      run: yarn install
 
     - name: Package artifacts
-      run: pnpm node-pre-gyp package
+      run: yarn node-pre-gyp package
 
-    - uses: csexton/release-asset-action@v2
+    - name: Upload to Release
+      uses: csexton/release-asset-action@v2
       if: ${{ !env.ACT }}
       with:
         pattern: build/stage/**/argon2*.tar.gz
@@ -65,31 +74,34 @@ jobs:
       image: node:18-alpine
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Install build deps
+        run: apk add make g++ python3 git
+
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: true
 
-      - uses: actions/setup-node@v4
+      - name: Use Node.js 18
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
-      - run: corepack enable
-      - run: apk add make g++ python3 git
-      - run: pnpm install --frozen-lockfile
+      - name: Install dependencies
+        run: yarn install
 
       - name: Package artifacts
-        run: pnpm node-pre-gyp package
+        run: yarn node-pre-gyp package
 
-      - uses: csexton/release-asset-action@v2
+      - name: Upload to Release
+        uses: csexton/release-asset-action@v2
         if: ${{ !env.ACT }}
         with:
           pattern: build/stage/**/argon2*.tar.gz
           github-token: ${{ secrets.GITHUB_TOKEN }}
           release-url: ${{ github.event.release.upload_url }}
 
   build-arm:
-    name: Build on arm64
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
@@ -98,13 +110,17 @@ jobs:
           - arch: aarch64
             distro: alpine_latest
 
+    name: Build on arm64
+    runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v4
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
         submodules: true
 
-    - uses: uraimo/run-on-arch-action@v2
-      name: Package artifacts
+    - name: Package artifacts
+      uses: uraimo/run-on-arch-action@v2
       id: build
       with:
         arch: ${{ matrix.arch }}
@@ -121,17 +137,18 @@ jobs:
               ;;
             alpine*)
               apk add --update make g++ python3
-              apk add --repository https://dl-cdn.alpinelinux.org/alpine/v3.17/main/ nodejs~=18 npm
+              apk add --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/v3.17/main/ nodejs~=18 npm
               ;;
           esac
           corepack enable
 
         run: |
           cd /repo
-          pnpm install --frozen-lockfile
-          pnpm node-pre-gyp package
+          yarn install --frozen-lockfile
+          yarn node-pre-gyp package
 
-    - uses: csexton/release-asset-action@v2
+    - name: Upload to Release
+      uses: csexton/release-asset-action@v2
       if: ${{ !env.ACT }}
       with:
         pattern: build/stage/**/argon2*.tar.gz
@@ -147,19 +164,19 @@ jobs:
         with:
           submodules: true
 
-      - uses: vmactions/freebsd-vm@v1
-        name: Package artifacts
+      - name: Package artifacts
+        uses: vmactions/freebsd-vm@v1
         with:
           envs: 'npm_config_build_from_source'
           prepare: |
-            pkg install -y gmake python3 node18
-            corepack enable && corepack prepare pnpm@latest --activate
+            pkg install -y gmake python3 yarn-node18
           run: |
-            pnpm install --frozen-lockfile
-            pnpm node-pre-gyp package
+            yarn install --frozen-lockfile
+            yarn node-pre-gyp package
           sync: sshfs
 
-      - uses: csexton/release-asset-action@v2
+      - name: Upload to Release
+        uses: csexton/release-asset-action@v2
         if: ${{ !env.ACT }}
         with:
           pattern: build/stage/**/argon2*.tar.gz

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "prettier": "^3.0.3",
     "typescript": "^5.2.2"
   },
-  "packageManager": "[email protected].2+sha256.487609e857f1c11780cc98dd0bfe4c8a8b11c7f23bc3a4493ac7d263d6fb6c8c",
+  "packageManager": "[email protected].2+sha256.825003a0f561ad09a3b1ac4a3b3ea6207af2796d54f62a9420520915721f5186",
   "engines": {
     "node": ">=18.13.0"
   },