diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02d23c2d543a..2429d3e93f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -383,8 +383,14 @@ jobs: cd build/stage1 ulimit -c unlimited # coredumps # exclude nonreproducible test - ctest -j4 --output-on-failure ${{ matrix.CTEST_OPTIONS }} < /dev/null + ctest -j4 --progress --output-junit test-results.xml --output-on-failure ${{ matrix.CTEST_OPTIONS }} < /dev/null if: (matrix.wasm || !matrix.cross) && needs.configure.outputs.quick == 'false' + - name: Test Summary + uses: test-summary/action@v2 + with: + paths: build/stage1/test-results.xml + # prefix `if` above with `always` so it's run even if tests failed + if: always() && (matrix.wasm || !matrix.cross) && needs.configure.outputs.quick == 'false' - name: Check Test Binary run: ${{ matrix.binary-check }} tests/compiler/534.lean.out if: ${{ !matrix.cross && needs.configure.outputs.quick == 'false' }} diff --git a/.github/workflows/nix-ci.yml b/.github/workflows/nix-ci.yml index 2cb77ae9757e..5fd86c3d4fe7 100644 --- a/.github/workflows/nix-ci.yml +++ b/.github/workflows/nix-ci.yml @@ -77,7 +77,12 @@ jobs: nix build $NIX_BUILD_ARGS .#cacheRoots -o push-build - name: Test run: | - nix build $NIX_BUILD_ARGS .#test -o push-test + nix build --keep-failed $NIX_BUILD_ARGS .#test -o push-test || (ln -s /tmp/nix-build-*/source/src/build/ ./push-test; false) + - name: Test Summary + uses: test-summary/action@v2 + with: + paths: push-test/test-results.xml + if: always() - name: Build manual run: | nix build $NIX_BUILD_ARGS --update-input lean --no-write-lock-file ./doc#{lean-mdbook,leanInk,alectryon,test,inked} -o push-doc diff --git a/doc/flake.nix b/doc/flake.nix index 20d50cd5a1f9..77af0ea086b2 100644 --- a/doc/flake.nix +++ b/doc/flake.nix @@ -27,7 +27,7 @@ src = inputs.mdBook; cargoDeps = drv.cargoDeps.overrideAttrs (_: { inherit src; - outputHash = "sha256-1YlPS6cqgxE4fjy9G8pWrpP27YrrbCDnfeyIsX81ZNw="; + outputHash = "sha256-CO3A9Kpp4sIvkT9X3p+GTidazk7Fn4jf0AP2PINN44A="; }); doCheck = false; }); diff --git a/flake.lock b/flake.lock index 50eba6836730..f675631d5b51 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,31 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -18,11 +37,11 @@ "lean4-mode": { "flake": false, "locked": { - "lastModified": 1676498134, - "narHash": "sha256-u3WvyKxOViZG53hkb8wd2/Og6muTecbh+NdflIgVeyk=", + "lastModified": 1709737301, + "narHash": "sha256-uT9JN2kLNKJK9c/S/WxLjiHmwijq49EgLb+gJUSDpz0=", "owner": "leanprover", "repo": "lean4-mode", - "rev": "2c6ef33f476fdf5eb5e4fa4fa023ba8b11372440", + "rev": "f1f24c15134dee3754b82c9d9924866fe6bc6b9f", "type": "github" }, "original": { @@ -31,34 +50,35 @@ "type": "github" } }, - "lowdown-src": { + "libgit2": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "libgit2", + "repo": "libgit2", "type": "github" } }, "nix": { "inputs": { - "lowdown-src": "lowdown-src", + "flake-compat": "flake-compat", + "libgit2": "libgit2", "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1657097207, - "narHash": "sha256-SmeGmjWM3fEed3kQjqIAO8VpGmkC2sL1aPE7kKpK650=", + "lastModified": 1711102798, + "narHash": "sha256-CXOIJr8byjolqG7eqCLa+Wfi7rah62VmLoqSXENaZnw=", "owner": "NixOS", "repo": "nix", - "rev": "f6316b49a0c37172bca87ede6ea8144d7d89832f", + "rev": "a22328066416650471c3545b0b138669ea212ab4", "type": "github" }, "original": { @@ -69,16 +89,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05-small", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } @@ -118,11 +138,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686089707, - "narHash": "sha256-LTNlJcru2qJ0XhlhG9Acp5KyjB774Pza3tRH0pKIb3o=", + "lastModified": 1710889954, + "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "af21c31b2a1ec5d361ed8050edd0303c31306397", + "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b", "type": "github" }, "original": { @@ -140,6 +160,21 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-old": "nixpkgs-old" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/nix/bootstrap.nix b/nix/bootstrap.nix index 73c4ba48d907..5bd2cfff22c3 100644 --- a/nix/bootstrap.nix +++ b/nix/bootstrap.nix @@ -170,10 +170,11 @@ rec { ln -sf ${lean-all}/* . ''; buildPhase = '' - ctest --output-on-failure -E 'leancomptest_(doc_example|foreign)' -j$NIX_BUILD_CORES + ctest --output-junit test-results.xml --output-on-failure -E 'leancomptest_(doc_example|foreign)' -j$NIX_BUILD_CORES ''; installPhase = '' - touch $out + mkdir $out + mv test-results.xml $out ''; }; update-stage0 =