diff --git a/.github/workflows/publish-nargo.yml b/.github/workflows/publish-nargo.yml index 3bcc9a13570..fc089008657 100644 --- a/.github/workflows/publish-nargo.yml +++ b/.github/workflows/publish-nargo.yml @@ -73,16 +73,6 @@ jobs: path: ./dist/* retention-days: 3 - - name: Install Yarn dependencies - if: matrix.target == 'x86_64-apple-darwin' - uses: ./.github/actions/setup - - - name: Test built artifact - if: matrix.target == 'x86_64-apple-darwin' - run: | - cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/ - yarn workspace release-tests test - - name: Upload binaries to release tag uses: svenstaro/upload-release-action@v2 if: ${{ inputs.publish || github.event_name == 'schedule' }} @@ -161,16 +151,6 @@ jobs: path: ./dist/* retention-days: 3 - - name: Install Yarn dependencies - if: startsWith(matrix.target, 'x86_64-unknown-linux') - uses: ./.github/actions/setup - - - name: Test built artifact - if: startsWith(matrix.target, 'x86_64-unknown-linux') - run: | - cp ./target/${{ matrix.target }}/release/nargo ~/.cargo/bin/ - yarn workspace release-tests test - - name: Upload binaries to release tag uses: svenstaro/upload-release-action@v2 if: ${{ inputs.publish }} diff --git a/Dockerfile.ci b/Dockerfile.ci index 57dcbe9cfee..a73ce4ab969 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -25,7 +25,6 @@ COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backe COPY ./tooling/noir_js/package.json ./tooling/noir_js/ COPY ./tooling/noir_codegen/package.json ./tooling/noir_codegen/ COPY ./compiler/integration-tests/package.json ./compiler/integration-tests/ -COPY ./release-tests/package.json ./release-tests/ COPY ./docs/package.json ./docs/ RUN yarn --immutable COPY . . diff --git a/package.json b/package.json index 789ba9dec55..e70189b5522 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "tooling/noir_codegen", "tooling/noir_js_backend_barretenberg", "acvm-repo/acvm_js", - "release-tests", "docs" ], "scripts": { diff --git a/release-tests/package.json b/release-tests/package.json deleted file mode 100644 index 3b73ad18574..00000000000 --- a/release-tests/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "release-tests", - "main": "index.js", - "license": "(MIT OR Apache-2.0)", - "private": true, - "type": "module", - "scripts": { - "test": "uvu test" - }, - "devDependencies": { - "uvu": "0.5.6", - "zx": "7.1.1" - } -} diff --git a/release-tests/test/6_array.test.js b/release-tests/test/6_array.test.js deleted file mode 100644 index 43d4a389264..00000000000 --- a/release-tests/test/6_array.test.js +++ /dev/null @@ -1,49 +0,0 @@ -import { suite } from "uvu"; -import { cd } from "zx"; -import { NARGO_BIN } from "./utils/nargo.js"; -import "./utils/zx.js"; - -const test = suite("nargo"); - -// Helps detect unresolved ProcessPromise. -let promiseResolved = false; -process.on("exit", () => { - if (!promiseResolved) { - console.error("Error: ProcessPromise never resolved."); - process.exitCode = 1; - } -}); - -test("promise resolved", async () => { - await $`echo PromiseHelper`; - promiseResolved = true; -}); - -test("nargo builds ../test_programs/execution_success/6_array sucessfully", async () => { - await within(async () => { - cd("../test_programs/execution_success/6_array"); - const command = `${NARGO_BIN} check`; - - await $`${command}`.nothrow(); - }); -}); - -test("nargo creates proof ../test_programs/execution_success/6_array sucessfully", async () => { - await within(async () => { - cd("../test_programs/execution_success/6_array"); - const command = `${NARGO_BIN} prove 6_array`; - - await $`${command}`.nothrow(); - }); -}); - -test("nargo verifies proof ../test_programs/execution_success/6_array sucessfully", async () => { - await within(async () => { - cd("../test_programs/execution_success/6_array"); - const command = `${NARGO_BIN} verify 6_array`; - - await $`${command}`.nothrow(); - }); -}); - -test.run(); diff --git a/release-tests/test/utils/nargo.js b/release-tests/test/utils/nargo.js deleted file mode 100644 index 6fcaccbcde7..00000000000 --- a/release-tests/test/utils/nargo.js +++ /dev/null @@ -1,3 +0,0 @@ -import { default as path } from "path"; - -export const NARGO_BIN = process.env.NARGO_BIN ? path.resolve(process.env.NARGO_BIN) : "nargo"; diff --git a/release-tests/test/utils/zx.js b/release-tests/test/utils/zx.js deleted file mode 100644 index a8ab500aec0..00000000000 --- a/release-tests/test/utils/zx.js +++ /dev/null @@ -1,11 +0,0 @@ -import "zx/globals"; - -// We perform any common setup for zx here to avoid repetition across test files. - -if (process.platform == "win32") { - $.shell = "powershell"; -} - -$.quote = (arg) => arg; - -$.verbose = true; diff --git a/release-tests/test/version.test.js b/release-tests/test/version.test.js deleted file mode 100644 index 7a70639d83e..00000000000 --- a/release-tests/test/version.test.js +++ /dev/null @@ -1,35 +0,0 @@ -import { suite } from "uvu"; -import * as assert from "uvu/assert"; -import { NARGO_BIN } from "./utils/nargo.js"; -import "./utils/zx.js"; - -const test = suite("nargo"); - -// Helps detect unresolved ProcessPromise. -let promiseResolved = false; -process.on("exit", () => { - if (!promiseResolved) { - console.error("Error: ProcessPromise never resolved."); - process.exitCode = 1; - } -}); - -test("promise resolved", async () => { - await $`echo PromiseHelper`; - promiseResolved = true; -}); - -test("prints version", async () => { - const processOutput = (await $`${NARGO_BIN} --version`).toString(); - - // Regex to match the "nargo version" part of the output - assert.match(processOutput, /nargo version = \d{1,2}\.\d{1,2}\.\d{1,2}/); -}); - - -test("reports a clean commit", async () => { - const processOutput = (await $`${NARGO_BIN} --version`).toString(); - assert.not.match(processOutput, /is dirty: true/) -}); - -test.run(); diff --git a/yarn.lock b/yarn.lock index f4e0ce7df36..5ec38f34c07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5906,15 +5906,6 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^9.0.13": - version: 9.0.13 - resolution: "@types/fs-extra@npm:9.0.13" - dependencies: - "@types/node": "*" - checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3 - languageName: node - linkType: hard - "@types/gtag.js@npm:^0.0.12": version: 0.0.12 resolution: "@types/gtag.js@npm:0.0.12" @@ -6110,13 +6101,6 @@ __metadata: languageName: node linkType: hard -"@types/minimist@npm:^1.2.2": - version: 1.2.5 - resolution: "@types/minimist@npm:1.2.5" - checksum: 477047b606005058ab0263c4f58097136268007f320003c348794f74adedc3166ffc47c80ec3e94687787f2ab7f4e72c468223946e79892cf0fd9e25e9970a90 - languageName: node - linkType: hard - "@types/mocha-each@npm:^2": version: 2.0.4 resolution: "@types/mocha-each@npm:2.0.4" @@ -6179,15 +6163,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.7.20": - version: 18.19.3 - resolution: "@types/node@npm:18.19.3" - dependencies: - undici-types: ~5.26.4 - checksum: 58c4fa45a78fcec75c78182a4b266395905957633654eb0311c5f9c30ac15c179ea2287ab1af034e46c2db7bb0589ef0000ee64c1de8f568a0aad29eaadb100c - languageName: node - linkType: hard - "@types/node@npm:^20.10.5": version: 20.10.5 resolution: "@types/node@npm:20.10.5" @@ -6257,13 +6232,6 @@ __metadata: languageName: node linkType: hard -"@types/ps-tree@npm:^1.1.2": - version: 1.1.6 - resolution: "@types/ps-tree@npm:1.1.6" - checksum: bf5b7bb9bd11b8762a8302b93c335728ecb19c85a74c640a3888d476368a03733f11612b9a87b1ad9ea56f95720db23a824c78113b16024dc59264b7f9008df5 - languageName: node - linkType: hard - "@types/qs@npm:*": version: 6.9.10 resolution: "@types/qs@npm:6.9.10" @@ -6474,13 +6442,6 @@ __metadata: languageName: node linkType: hard -"@types/which@npm:^2.0.1": - version: 2.0.2 - resolution: "@types/which@npm:2.0.2" - checksum: 8626a3c2f6db676c449142e1082e33ea0c9d88b8a2bd796366b944891e6da0088b2aa83d3fa9c79e6696f7381a851fc76d43bd353eb6c4d98a7775b4ae0a96a5 - languageName: node - linkType: hard - "@types/ws@npm:^7.4.0": version: 7.4.7 resolution: "@types/ws@npm:7.4.7" @@ -9971,13 +9932,6 @@ __metadata: languageName: node linkType: hard -"data-uri-to-buffer@npm:^4.0.0": - version: 4.0.1 - resolution: "data-uri-to-buffer@npm:4.0.1" - checksum: 0d0790b67ffec5302f204c2ccca4494f70b4e2d940fea3d36b09f0bb2b8539c2e86690429eb1f1dc4bcc9e4df0644193073e63d9ee48ac9fce79ec1506e4aa4c - languageName: node - linkType: hard - "data-uri-to-buffer@npm:^6.0.0": version: 6.0.1 resolution: "data-uri-to-buffer@npm:6.0.1" @@ -10541,7 +10495,7 @@ __metadata: languageName: node linkType: hard -"duplexer@npm:^0.1.2, duplexer@npm:~0.1.1": +"duplexer@npm:^0.1.2": version: 0.1.2 resolution: "duplexer@npm:0.1.2" checksum: 62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0 @@ -11346,21 +11300,6 @@ __metadata: languageName: node linkType: hard -"event-stream@npm:=3.3.4": - version: 3.3.4 - resolution: "event-stream@npm:3.3.4" - dependencies: - duplexer: ~0.1.1 - from: ~0 - map-stream: ~0.1.0 - pause-stream: 0.0.11 - split: 0.3 - stream-combiner: ~0.0.4 - through: ~2.3.1 - checksum: 80b467820b6daf824d9fb4345d2daf115a056e5c104463f2e98534e92d196a27f2df5ea2aa085624db26f4c45698905499e881d13bc7c01f7a13eac85be72a22 - languageName: node - linkType: hard - "event-target-shim@npm:^5.0.0": version: 5.0.1 resolution: "event-target-shim@npm:5.0.1" @@ -11629,16 +11568,6 @@ __metadata: languageName: node linkType: hard -"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4": - version: 3.2.0 - resolution: "fetch-blob@npm:3.2.0" - dependencies: - node-domexception: ^1.0.0 - web-streams-polyfill: ^3.0.3 - checksum: f19bc28a2a0b9626e69fd7cf3a05798706db7f6c7548da657cbf5026a570945f5eeaedff52007ea35c8bcd3d237c58a20bf1543bc568ab2422411d762dd3d5bf - languageName: node - linkType: hard - "fflate@npm:^0.8.0, fflate@npm:^0.8.1": version: 0.8.1 resolution: "fflate@npm:0.8.1" @@ -11922,15 +11851,6 @@ __metadata: languageName: node linkType: hard -"formdata-polyfill@npm:^4.0.10": - version: 4.0.10 - resolution: "formdata-polyfill@npm:4.0.10" - dependencies: - fetch-blob: ^3.1.2 - checksum: 82a34df292afadd82b43d4a740ce387bc08541e0a534358425193017bf9fb3567875dc5f69564984b1da979979b70703aa73dee715a17b6c229752ae736dd9db - languageName: node - linkType: hard - "forwarded@npm:0.2.0": version: 0.2.0 resolution: "forwarded@npm:0.2.0" @@ -11966,13 +11886,6 @@ __metadata: languageName: node linkType: hard -"from@npm:~0": - version: 0.1.7 - resolution: "from@npm:0.1.7" - checksum: b85125b7890489656eb2e4f208f7654a93ec26e3aefaf3bbbcc0d496fc1941e4405834fcc9fe7333192aa2187905510ace70417bbf9ac6f6f4784a731d986939 - languageName: node - linkType: hard - "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -12392,7 +12305,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^13.1.1, globby@npm:^13.1.2": +"globby@npm:^13.1.1": version: 13.2.2 resolution: "globby@npm:13.2.2" dependencies: @@ -14444,13 +14357,6 @@ __metadata: languageName: node linkType: hard -"kleur@npm:^4.0.3": - version: 4.1.5 - resolution: "kleur@npm:4.1.5" - checksum: 1dc476e32741acf0b1b5b0627ffd0d722e342c1b0da14de3e8ae97821327ca08f9fb944542fb3c126d90ac5f27f9d804edbe7c585bf7d12ef495d115e0f22c12 - languageName: node - linkType: hard - "koa-compose@npm:^4.1.0": version: 4.1.0 resolution: "koa-compose@npm:4.1.0" @@ -15053,13 +14959,6 @@ __metadata: languageName: node linkType: hard -"map-stream@npm:~0.1.0": - version: 0.1.0 - resolution: "map-stream@npm:0.1.0" - checksum: 38abbe4eb883888031e6b2fc0630bc583c99396be16b8ace5794b937b682a8a081f03e8b15bfd4914d1bc88318f0e9ac73ba3512ae65955cd449f63256ddb31d - languageName: node - linkType: hard - "mark.js@npm:^8.11.1": version: 8.11.1 resolution: "mark.js@npm:8.11.1" @@ -16379,13 +16278,6 @@ __metadata: languageName: node linkType: hard -"mri@npm:^1.1.0": - version: 1.2.0 - resolution: "mri@npm:1.2.0" - checksum: 83f515abbcff60150873e424894a2f65d68037e5a7fcde8a9e2b285ee9c13ac581b63cfc1e6826c4732de3aeb84902f7c1e16b7aff46cd3f897a0f757a894e85 - languageName: node - linkType: hard - "mrmime@npm:^1.0.0": version: 1.0.1 resolution: "mrmime@npm:1.0.1" @@ -16518,13 +16410,6 @@ __metadata: languageName: node linkType: hard -"node-domexception@npm:^1.0.0": - version: 1.0.0 - resolution: "node-domexception@npm:1.0.0" - checksum: ee1d37dd2a4eb26a8a92cd6b64dfc29caec72bff5e1ed9aba80c294f57a31ba4895a60fd48347cf17dd6e766da0ae87d75657dfd1f384ebfa60462c2283f5c7f - languageName: node - linkType: hard - "node-emoji@npm:^1.10.0": version: 1.11.0 resolution: "node-emoji@npm:1.11.0" @@ -16560,17 +16445,6 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:3.2.10": - version: 3.2.10 - resolution: "node-fetch@npm:3.2.10" - dependencies: - data-uri-to-buffer: ^4.0.0 - fetch-blob: ^3.1.4 - formdata-polyfill: ^4.0.10 - checksum: e65322431f4897ded04197aa5923eaec63a8d53e00432de4e70a4f7006625c8dc32629c5c35f4fe8ee719a4825544d07bf53f6e146a7265914262f493e8deac1 - languageName: node - linkType: hard - "node-fetch@npm:^2.6.12": version: 2.7.0 resolution: "node-fetch@npm:2.7.0" @@ -17329,15 +17203,6 @@ __metadata: languageName: node linkType: hard -"pause-stream@npm:0.0.11": - version: 0.0.11 - resolution: "pause-stream@npm:0.0.11" - dependencies: - through: ~2.3 - checksum: 3c4a14052a638b92e0c96eb00c0d7977df7f79ea28395250c525d197f1fc02d34ce1165d5362e2e6ebbb251524b94a76f3f0d4abc39ab8b016d97449fe15583c - languageName: node - linkType: hard - "pbkdf2@npm:^3.0.17": version: 3.1.2 resolution: "pbkdf2@npm:3.1.2" @@ -18096,17 +17961,6 @@ __metadata: languageName: node linkType: hard -"ps-tree@npm:^1.2.0": - version: 1.2.0 - resolution: "ps-tree@npm:1.2.0" - dependencies: - event-stream: =3.3.4 - bin: - ps-tree: ./bin/ps-tree.js - checksum: e635dd00f53d30d31696cf5f95b3a8dbdf9b1aeb36d4391578ce8e8cd22949b7c5536c73b0dc18c78615ea3ddd4be96101166be59ca2e3e3cb1e2f79ba3c7f98 - languageName: node - linkType: hard - "pump@npm:^3.0.0": version: 3.0.0 resolution: "pump@npm:3.0.0" @@ -18754,15 +18608,6 @@ __metadata: languageName: node linkType: hard -"release-tests@workspace:release-tests": - version: 0.0.0-use.local - resolution: "release-tests@workspace:release-tests" - dependencies: - uvu: 0.5.6 - zx: 7.1.1 - languageName: unknown - linkType: soft - "remark-directive@npm:^3.0.0": version: 3.0.0 resolution: "remark-directive@npm:3.0.0" @@ -19320,15 +19165,6 @@ __metadata: languageName: node linkType: hard -"sade@npm:^1.7.3": - version: 1.8.1 - resolution: "sade@npm:1.8.1" - dependencies: - mri: ^1.1.0 - checksum: 0756e5b04c51ccdc8221ebffd1548d0ce5a783a44a0fa9017a026659b97d632913e78f7dca59f2496aa996a0be0b0c322afd87ca72ccd909406f49dbffa0f45d - languageName: node - linkType: hard - "safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": version: 5.1.2 resolution: "safe-buffer@npm:5.1.2" @@ -19981,15 +19817,6 @@ __metadata: languageName: node linkType: hard -"split@npm:0.3": - version: 0.3.3 - resolution: "split@npm:0.3.3" - dependencies: - through: 2 - checksum: 2e076634c9637cfdc54ab4387b6a243b8c33b360874a25adf6f327a5647f07cb3bf1c755d515248eb3afee4e382278d01f62c62d87263c118f28065b86f74f02 - languageName: node - linkType: hard - "sprintf-js@npm:^1.0.3": version: 1.1.3 resolution: "sprintf-js@npm:1.1.3" @@ -20071,15 +19898,6 @@ __metadata: languageName: node linkType: hard -"stream-combiner@npm:~0.0.4": - version: 0.0.4 - resolution: "stream-combiner@npm:0.0.4" - dependencies: - duplexer: ~0.1.1 - checksum: 844b622cfe8b9de45a6007404f613b60aaf85200ab9862299066204242f89a7c8033b1c356c998aa6cfc630f6cd9eba119ec1c6dc1f93e245982be4a847aee7d - languageName: node - linkType: hard - "stream-read-all@npm:^3.0.1": version: 3.0.1 resolution: "stream-read-all@npm:3.0.1" @@ -20520,7 +20338,7 @@ __metadata: languageName: node linkType: hard -"through@npm:2, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1": +"through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd @@ -21551,20 +21369,6 @@ __metadata: languageName: node linkType: hard -"uvu@npm:0.5.6": - version: 0.5.6 - resolution: "uvu@npm:0.5.6" - dependencies: - dequal: ^2.0.0 - diff: ^5.0.0 - kleur: ^4.0.3 - sade: ^1.7.3 - bin: - uvu: bin.js - checksum: 09460a37975627de9fcad396e5078fb844d01aaf64a6399ebfcfd9e55f1c2037539b47611e8631f89be07656962af0cf48c334993db82b9ae9c3d25ce3862168 - languageName: node - linkType: hard - "uzip-module@npm:^1.0.2": version: 1.0.3 resolution: "uzip-module@npm:1.0.3" @@ -21740,13 +21544,6 @@ __metadata: languageName: node linkType: hard -"web-streams-polyfill@npm:^3.0.3": - version: 3.2.1 - resolution: "web-streams-polyfill@npm:3.2.1" - checksum: b119c78574b6d65935e35098c2afdcd752b84268e18746606af149e3c424e15621b6f1ff0b42b2676dc012fc4f0d313f964b41a4b5031e525faa03997457da02 - languageName: node - linkType: hard - "webidl-conversions@npm:^3.0.0": version: 3.0.1 resolution: "webidl-conversions@npm:3.0.1" @@ -22301,7 +22098,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.1.1, yaml@npm:^2.2.2, yaml@npm:^2.3.4": +"yaml@npm:^2.2.2, yaml@npm:^2.3.4": version: 2.3.4 resolution: "yaml@npm:2.3.4" checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8 @@ -22437,26 +22234,3 @@ __metadata: checksum: f22ec5fc2d5f02c423c93d35cdfa83573a3a3bd98c66b927c368ea4d0e7252a500df2a90a6b45522be536a96a73404393c958e945fdba95e6832c200791702b6 languageName: node linkType: hard - -"zx@npm:7.1.1": - version: 7.1.1 - resolution: "zx@npm:7.1.1" - dependencies: - "@types/fs-extra": ^9.0.13 - "@types/minimist": ^1.2.2 - "@types/node": ^18.7.20 - "@types/ps-tree": ^1.1.2 - "@types/which": ^2.0.1 - chalk: ^5.0.1 - fs-extra: ^10.1.0 - globby: ^13.1.2 - minimist: ^1.2.6 - node-fetch: 3.2.10 - ps-tree: ^1.2.0 - which: ^2.0.2 - yaml: ^2.1.1 - bin: - zx: build/cli.js - checksum: 510c56366a62220108247624a83fc088bfc8f393e3f20168d69a67e3c7aff1a4b790c118ee70e58171dcbc91b53ab079bba3074e1c40829f6179a7f48a38be78 - languageName: node - linkType: hard