From dcde33a5485d85205ce40d931029005e38909d9d Mon Sep 17 00:00:00 2001 From: Eduard Nicodei Date: Mon, 15 Jul 2024 22:05:49 +0100 Subject: [PATCH 1/4] include ci.yaml in the jit generation hash --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55e88ddbaf..6728221aa2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -372,7 +372,7 @@ jobs: id: cache-generated-source with: path: ${{ env.jit_generated_src_scheme }} - key: jit_generated_src_scheme-jit_${{env.jit_version}}-${{env.jit_causalhash}} + key: jit_generated_src_scheme-jit_${{env.jit_version}}-${{env.jit_causalhash}}-${{ hashFiles('**/ci.yaml') }} - name: create transcript if: steps.cache-generated-source.outputs.cache-hit != 'true' uses: DamianReeves/write-file-action@v1.3 From 0c18fc623060fa8567c6d3b8a8026288711c9895 Mon Sep 17 00:00:00 2001 From: Eduard Nicodei Date: Mon, 15 Jul 2024 22:36:38 +0100 Subject: [PATCH 2/4] fix jit generation in ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6728221aa2..1d26acc843 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -381,7 +381,7 @@ jobs: write-mode: overwrite contents: | ```ucm - .> project.create-empty jit-setup + scratch/main> project.create-empty jit-setup jit-setup/main> lib.install ${{ env.jit_version }} ``` ```unison From 972ed6a310dbf19ff3e594d5208f4dba26a3752f Mon Sep 17 00:00:00 2001 From: Eduard Nicodei Date: Wed, 17 Jul 2024 22:08:14 +0100 Subject: [PATCH 3/4] also hash ucm binary --- .github/workflows/ci-test-jit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test-jit.yaml b/.github/workflows/ci-test-jit.yaml index 6162c535f2..d4248a227d 100644 --- a/.github/workflows/ci-test-jit.yaml +++ b/.github/workflows/ci-test-jit.yaml @@ -74,7 +74,7 @@ jobs: uses: actions/cache@v4 with: path: ${{env.jit_test_results}} - key: jit-test-results.dist-exe_${{ hashFiles(env.jit_dist_rel_exe) }}.tests_${{ env.runtime_tests_causalhash }}.yaml_${{ hashFiles('**/ci-test-jit.yaml') }} + key: jit-test-results.dist-exe_${{ hashFiles(env.jit_dist_rel_exe) }}.tests_${{ env.runtime_tests_causalhash }}.yaml_${{ hashFiles('**/ci-test-jit.yaml') }}_$({ hashFiles(env.ucm) }) - name: install libb2 (linux) uses: awalsh128/cache-apt-pkgs-action@latest From 68ab0167dd0bb4e43c8a700b9a82824ab299871e Mon Sep 17 00:00:00 2001 From: Eduard Nicodei Date: Wed, 17 Jul 2024 22:24:54 +0100 Subject: [PATCH 4/4] just whitespace changes --- unison-src/builtin-tests/jit-tests.output.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unison-src/builtin-tests/jit-tests.output.md b/unison-src/builtin-tests/jit-tests.output.md index 4bdb6cc29f..616d2d5d9c 100644 --- a/unison-src/builtin-tests/jit-tests.output.md +++ b/unison-src/builtin-tests/jit-tests.output.md @@ -34,9 +34,9 @@ foo = do I found and typechecked these definitions in scratch.u. If you do an `add` or `update`, here's how your codebase would change: - + ⍟ These new definitions are ok to `add`: - + foo : '{Exception} () ``` @@ -58,10 +58,10 @@ an exception. runtime-tests/selected> run.native testBug 💔💥 - + I've encountered a call to builtin.bug with the following value: - + "testing" ```