diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 37930bc..8e47c8b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,7 @@ permissions: jobs: publish: - uses: Emerging-Patterns/actions/.github/workflows/publish.yml@df4af92903396c9021937801c4f7f0c26ac3e890 + uses: Emerging-Patterns/actions/.github/workflows/publish.yml@73b2fbc64cefd6e22bd786437adb5f35190ee837 with: tag: ${{ inputs.tag }} hub-name: emerging-ezjson diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 4c03561..ce58853 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -22,7 +22,7 @@ jobs: contents: write pull-requests: write issues: write - uses: Emerging-Patterns/actions/.github/workflows/release-please.yml@df4af92903396c9021937801c4f7f0c26ac3e890 + uses: Emerging-Patterns/actions/.github/workflows/release-please.yml@73b2fbc64cefd6e22bd786437adb5f35190ee837 with: config-file: .github/release-please-config.json manifest-file: .github/release-please-manifest.json @@ -32,7 +32,7 @@ jobs: if: needs.release-please.outputs.release_created == 'true' permissions: contents: read - uses: Emerging-Patterns/actions/.github/workflows/publish.yml@df4af92903396c9021937801c4f7f0c26ac3e890 + uses: Emerging-Patterns/actions/.github/workflows/publish.yml@73b2fbc64cefd6e22bd786437adb5f35190ee837 with: tag: ${{ needs.release-please.outputs.tag_name }} hub-name: emerging-ezjson diff --git a/ez.lock.toml b/ez.lock.toml index a6e1ce8..82b24fa 100644 --- a/ez.lock.toml +++ b/ez.lock.toml @@ -4,7 +4,8 @@ hub = "https://hub.bend-lang.com" [tools] [tools.bolt] git = "https://github.com/Emerging-Patterns/bolt" -rev = "efb82d24598bd3e9e64004bc443093d4dd072173" +rev = "358c2da98df8d2d15c5ceaa3a56521212b9029ca" +tag = "v1.17.0" root = "." -narHash = "sha256-hw4rVnEWEi9Q/Cen7ZGqdz+lYm1vup3+52rBwCEBskY=" +narHash = "sha256-J+XYAGvL7FOs4NgRwGG8itNlYTIQBM7dNq/r5nrB1Z8=" entry = "main.bend" diff --git a/ez.toml b/ez.toml index 23fe06e..5fe101f 100644 --- a/ez.toml +++ b/ez.toml @@ -1,10 +1,11 @@ [package] name = "ezjson" entry = "main.bend" - +[tools] [tools.bolt] git = "https://github.com/Emerging-Patterns/bolt" -rev = "efb82d24598bd3e9e64004bc443093d4dd072173" +rev = "358c2da98df8d2d15c5ceaa3a56521212b9029ca" +tag = "v1.17.0" root = "." -narHash = "sha256-hw4rVnEWEi9Q/Cen7ZGqdz+lYm1vup3+52rBwCEBskY=" +narHash = "sha256-J+XYAGvL7FOs4NgRwGG8itNlYTIQBM7dNq/r5nrB1Z8=" entry = "main.bend" diff --git a/flake.lock b/flake.lock index 8af780d..2a21c58 100644 --- a/flake.lock +++ b/flake.lock @@ -21,41 +21,21 @@ "type": "github" } }, - "bend_2": { - "inputs": { - "nixpkgs": [ - "ez", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1791348820, - "narHash": "sha256-2YQX/3rN/NVkKcxjVMPLs4D5ItBwsVTEJxxKV6mIGSE=", - "owner": "bendlang", - "repo": "bend", - "rev": "eebc18cd04daeade06c3f68c3c96c1faefd3462f", - "type": "github" - }, - "original": { - "owner": "bendlang", - "repo": "bend", - "rev": "eebc18cd04daeade06c3f68c3c96c1faefd3462f", - "type": "github" - } - }, "ez": { "inputs": { - "bend": "bend_2", + "bend": [ + "bend" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1791381403, - "narHash": "sha256-TaCVkunKx0FZVquSGNHmuzPDAI7DCv8Sy8upvTh324g=", + "lastModified": 1792730458, + "narHash": "sha256-gpyP8MmnJcmOdvlWRm5SGMKomi/pimr9dKaq0DExVew=", "owner": "Emerging-Patterns", "repo": "ez", - "rev": "10276ec0d103f77f14bf2191e6bf7d41416a870f", + "rev": "166a23c54b1c5a7bf587abd3d906332bd73a856b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bdb43eb..fd56fb9 100644 --- a/flake.nix +++ b/flake.nix @@ -8,14 +8,10 @@ url = "github:bendlang/bend/042e797ebd1cfc060603e2682879909fe86fa8c2"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Interim: ez 1.5.0 does not build on 2.0.38 yet, so ez (and the bolt it - # builds for mkLint) stays on its own bend, 2.0.36. The proofs run on this - # flake's bend (checks.proofs below). The tooling pass, once ez releases on - # 2.0.38, puts `inputs.bend.follows = "bend"` and ez.mkProofs back. inputs.ez = { url = "github:Emerging-Patterns/ez"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.bend.url = "github:bendlang/bend/eebc18cd04daeade06c3f68c3c96c1faefd3462f"; + inputs.bend.follows = "bend"; }; outputs = { self, nixpkgs, ... }@inputs: @@ -26,7 +22,7 @@ ez = inputs.ez.lib.${system}; ezBin = inputs.ez.packages.${system}.default; bend = inputs.bend.packages.${system}.default; - bolt = ez.toolPackage { name = "bolt"; src = self; wrapFlags = [ "--gpu" "off" ]; }; + bolt = ez.toolPackage { name = "bolt"; src = self; inherit bend; wrapFlags = ez.rtsFlags bend [ "--gpu" "off" ]; }; bend-cc = ez.bend-cc; bench = import ./bench { @@ -47,21 +43,7 @@ apps.${system} = bench.apps; checks.${system} = { - # every PROOF.bend must print ALL PROOFS CHECK, on this flake's bend - # (interim for ez.mkProofs, which runs ez's own bend) - proofs = pkgs.runCommand "ezjson-proofs" { - nativeBuildInputs = [ bend ]; - BEND_LIB = ez.bendLib ./ez.lock.toml; - } '' - export HOME=$TMPDIR - cp -r ${self} src && chmod -R u+w src && cd src - for p in $(find . -name PROOF.bend -not -path './.ez/*' | sort); do - first=$(cd "$(dirname "$p")" && bend "$(basename "$p")" | head -n 1) - echo "$p: $first" - [ "$first" = "ALL PROOFS CHECK" ] || exit 1 - done - touch $out - ''; + proofs = ez.mkProofs { ez = ezBin; src = self; }; lint = ez.mkLint { src = self; }; } // bench.checks // scale.checks;