refactor: generate without invoking scripts from proposals

Agoric · Feb 28, 2024 · 674fcd5 · 674fcd5
1 parent 29e16b0
commit 674fcd5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/a3p-integration/proposals/a:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-next/package.json
@@ -6,6 +6,8 @@
     "upgradeInfo": {
       "coreProposals": []
     },
+    "submission": "probe-zcf-bundle",
+    "probe-zcf-bundle": "a:upgrade-next probeZcfBundle probe-submission",
     "type": "Software Upgrade Proposal"
   },
   "type": "module",
@@ -23,8 +25,7 @@
     ]
   },
   "scripts": {
-    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops",
-    "build:submission": "../../../scripts/generate-a3p-submission.sh probe-zcf-bundle a:upgrade-next probeZcfBundle probe-submission"
+    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
   },
   "packageManager": "yarn@4.1.0"
 }
diff --git a/a3p-integration/proposals/b:localchain/package.json b/a3p-integration/proposals/b:localchain/package.json
@@ -1,7 +1,9 @@
 {
   "agoricProposal": {
     "type": "/agoric.swingset.CoreEvalProposal",
-    "source": "subdir"
+    "source": "subdir",
+    "submission": "test-localchain",
+    "test-localchain": "b:localchain"
   },
   "type": "module",
   "license": "Apache-2.0",
@@ -16,8 +18,5 @@
       "!submission"
     ]
   },
-  "scripts": {
-    "build:submission": "../../../scripts/generate-a3p-submission.sh test-localchain b:localchain"
-  },
   "packageManager": "yarn@4.1.0"
 }
diff --git a/scripts/generate-a3p-submission-dirs.sh b/scripts/generate-a3p-submission-dirs.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
 set -ueo pipefail
 
+SCRIPT_DIR=$( cd ${0%/*} && pwd -P )
+
 for proposal in ./proposals/?:*
 do
   cd $proposal
-  yarn run build:submission
+  submission=`jq -r < package.json '.agoricProposal.submission'`
+  args=`jq -r < package.json .agoricProposal[\"$submission\"]`
+  $SCRIPT_DIR/generate-a3p-submission.sh $submission $args
   cd -
 done