build: upgrade to Yarn 4

Agoric · Nov 7, 2023 · 81656a1 · 81656a1
1 parent fdbd756
commit 81656a1
Show file tree

Hide file tree

Showing 23 changed files with 10,576 additions and 7,100 deletions.
diff --git a/makeDockerfile.ts b/makeDockerfile.ts
@@ -96,9 +96,11 @@ COPY --link --chmod=755 ./proposals/${proposalIdentifier}:${proposalName} /usr/s
 # install using global cache
 RUN --mount=type=cache,target=/root/.yarn \
   cd /usr/src/upgrade-test-scripts/lib/ \
+  && corepack enable \
+  && yarn --version \
   && yarn install \
   && cd /usr/src/proposals/${proposalIdentifier}:${proposalName} \
-  && test -n "yarn.lock" && yarn install --frozen-lockfile --production
+  && test -n "yarn.lock" && yarn install --immutable
 
 COPY --link --chmod=755 ./upgrade-test-scripts/run_eval.sh /usr/src/upgrade-test-scripts/run_eval.sh
 WORKDIR /usr/src/upgrade-test-scripts
@@ -126,9 +128,11 @@ COPY --link ./upgrade-test-scripts/lib /usr/src/upgrade-test-scripts/lib
 # install using global cache
 RUN --mount=type=cache,target=/root/.yarn \
   cd /usr/src/upgrade-test-scripts/lib/ \
+  && corepack enable \
+  && yarn --version \
   && yarn install \
   && cd /usr/src/proposals/${proposalIdentifier}:${proposalName} \
-  && test -n "yarn.lock" && yarn install --frozen-lockfile --production
+  && test -n "yarn.lock" && yarn install --immutable
 
 COPY --link --chmod=755 ./upgrade-test-scripts/run_use.sh /usr/src/upgrade-test-scripts/run_use.sh
 WORKDIR /usr/src/upgrade-test-scripts
@@ -152,9 +156,11 @@ FROM use-${proposalName} as test-${proposalName}
 # install using global cache
 RUN --mount=type=cache,target=/root/.yarn \
   cd /usr/src/upgrade-test-scripts/lib/ \
+  && corepack enable \
+  && yarn --version \
   && yarn install \
   && cd /usr/src/proposals/${proposalIdentifier}:${proposalName} \
-  && test -n "yarn.lock" && yarn install --frozen-lockfile --production
+  && test -n "yarn.lock" && yarn install --immutable
 
 COPY --link --chmod=755 ./upgrade-test-scripts/run_test.sh /usr/src/upgrade-test-scripts/run_test.sh
 WORKDIR /usr/src/upgrade-test-scripts

diff --git a/proposals/34:upgrade-10/.yarn/install-state.gz b/proposals/34:upgrade-10/.yarn/install-state.gz
diff --git a/proposals/34:upgrade-10/.yarnrc.yml b/proposals/34:upgrade-10/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/proposals/34:upgrade-10/package.json b/proposals/34:upgrade-10/package.json
@@ -1,13 +1,13 @@
 {
     "type": "module",
     "license": "Apache-2.0",
-    "devDependencies": {},
     "dependencies": {
         "ava": "^5.3.1",
         "better-sqlite3": "^8.5.1",
         "execa": "^7.2.0"
     },
     "scripts": {
         "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
-    }
+    },
+    "packageManager": "[email protected]"
 }
diff --git a/proposals/34:upgrade-10/yarn.lock b/proposals/34:upgrade-10/yarn.lock
diff --git a/proposals/43:upgrade-11/.yarn/install-state.gz b/proposals/43:upgrade-11/.yarn/install-state.gz
diff --git a/proposals/43:upgrade-11/.yarnrc.yml b/proposals/43:upgrade-11/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/proposals/43:upgrade-11/package.json b/proposals/43:upgrade-11/package.json
@@ -1,13 +1,13 @@
 {
     "type": "module",
     "license": "Apache-2.0",
-    "devDependencies": {},
     "dependencies": {
         "ava": "^5.3.1",
         "better-sqlite3": "^8.5.1",
         "execa": "^7.2.0"
     },
     "scripts": {
         "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
-    }
+    },
+    "packageManager": "[email protected]"
 }