From 250c6ec5454dd4a56e8777e674670be750c102f4 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Sun, 26 May 2024 12:48:40 -0600
Subject: [PATCH 1/2] ci(dependency-graph): remove packing artifacts from cache

---
 .github/workflows/test-all-packages.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-all-packages.yml b/.github/workflows/test-all-packages.yml
index 35f93c40185..f88455570dc 100644
--- a/.github/workflows/test-all-packages.yml
+++ b/.github/workflows/test-all-packages.yml
@@ -60,13 +60,21 @@ jobs:
       # Due to ambient types, certain build orders (from the dependency graph)
       # may break the type resolution. Run this in the PR to find out before
       # attempting to merge to master. This takes about 1min locally and since
-      # this job is about 30s in CI doing it here doesn't add to wall wait
-      # for CI resolution.
-      # We prepack only because full pack removes the declarations, relying on ambient
-      # resolution in the repo filesystem which will not be available when the packages
-      # are pulled from npm.
-      - name: Pack packages
-        run: yarn lerna run --reject-cycles --concurrency 1 prepack
+      # this job is about 30s in CI doing it here doesn't add to wall wait for
+      # CI resolution.
+      #
+      # We prepack only because full pack removes the declarations, relying on
+      # ambient resolution in the repo filesystem which will not be available
+      # when the packages are pulled from npm.
+      #
+      # After that test, we postpack to avoid putting the prepack artifacts in
+      # the cache maintained by restore-node, since they are not .gitignored and
+      # thus will fail restore-node's check for a clean repo when the cache is
+      # restored.
+      - name: Pack packages without ambient type resolution
+        run: |
+          yarn lerna run --reject-cycles --concurrency 1 prepack
+          yarn lerna run postpack
 
   ##################
   # Lint tests

From 9878b434e41c2dc6c17c84c8d934a07299bd2c4c Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Mon, 27 May 2024 22:53:22 -0600
Subject: [PATCH 2/2] test(a3p): temporarily make `fromTag` `use-upgrade-14`

---
 a3p-integration/package.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/a3p-integration/package.json b/a3p-integration/package.json
index ea69904c0f2..c1d877f736c 100644
--- a/a3p-integration/package.json
+++ b/a3p-integration/package.json
@@ -1,20 +1,20 @@
 {
-    "private": true,
-    "agoricSyntheticChain": {
-        "fromTag": "latest"
-    },
-    "scripts": {
-        "build": "yarn run build:sdk && yarn run build:submissions && yarn run build:synthetic-chain",
-        "build:sdk": "make -C ../packages/deployment docker-build-sdk",
-        "build:submissions": "scripts/build-all-submissions.sh",
-        "build:synthetic-chain": "yarn synthetic-chain build",
-        "test": "yarn synthetic-chain test",
-        "doctor": "yarn synthetic-chain doctor"
-    },
-    "dependencies": {
-        "@agoric/synthetic-chain": "^0.1.0",
-        "@types/better-sqlite3": "^7.6.9"
-    },
-    "packageManager": "yarn@4.1.1",
-    "license": "Apache-2.0"
+  "private": true,
+  "agoricSyntheticChain": {
+    "fromTag": "use-upgrade-14"
+  },
+  "scripts": {
+    "build": "yarn run build:sdk && yarn run build:submissions && yarn run build:synthetic-chain",
+    "build:sdk": "make -C ../packages/deployment docker-build-sdk",
+    "build:submissions": "scripts/build-all-submissions.sh",
+    "build:synthetic-chain": "yarn synthetic-chain build",
+    "test": "yarn synthetic-chain test",
+    "doctor": "yarn synthetic-chain doctor"
+  },
+  "dependencies": {
+    "@agoric/synthetic-chain": "^0.1.0",
+    "@types/better-sqlite3": "^7.6.9"
+  },
+  "packageManager": "yarn@4.1.1",
+  "license": "Apache-2.0"
 }