From 865c49d33feeec34ceded80fbaa22c94625a4e91 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:40:10 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 664dc674..dc6b64f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,3 +17,8 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-verify-coq #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 + # Lean isn't supported by Nix, so we need to add extra steps + # Install Elan (https://leanprover-community.github.io/install/linux.html) + - curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + # Verify + - cd tests/lean && make -- cgit v1.2.3 From 084599ea54925d716251d0bbf120555d38c3ec14 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:41:37 +0100 Subject: Make a minor update --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc6b64f6..6fba43a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,6 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 # Lean isn't supported by Nix, so we need to add extra steps # Install Elan (https://leanprover-community.github.io/install/linux.html) - - curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + - runs: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh # Verify - - cd tests/lean && make + - run: cd tests/lean && make -- cgit v1.2.3 From 8471e87b2b1b8123f15f5613e633daf68ccf94dc Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:42:19 +0100 Subject: Make a minor fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fba43a5..a67a2aed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,6 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 # Lean isn't supported by Nix, so we need to add extra steps # Install Elan (https://leanprover-community.github.io/install/linux.html) - - runs: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh # Verify - run: cd tests/lean && make -- cgit v1.2.3 From e3dc6001c953cd3a292326672762b4dfdbbb933c Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:54:34 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a67a2aed..d8a91aa7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,12 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-verify-coq #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 - # Lean isn't supported by Nix, so we need to add extra steps + lean: # Lean isn't supported by Nix, so we need to add extra steps + runs-on: [self-hosted, linux] + steps: # Install Elan (https://leanprover-community.github.io/install/linux.html) - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + # We need make + - run: sudo apt-get update && sudo apt-get install make # Verify - run: cd tests/lean && make -- cgit v1.2.3 From 335e1fdf1b55fa49c378a32dc5619369f366027c Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:56:20 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d8a91aa7..1ac5dd94 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: steps: # Install Elan (https://leanprover-community.github.io/install/linux.html) - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh - # We need make - - run: sudo apt-get update && sudo apt-get install make + #- run: sudo apt-get update && sudo apt-get install make # Verify - - run: cd tests/lean && make + #- run: cd tests/lean && make + - cd tests/lean && lake build -- cgit v1.2.3 From 06ca6b4aeee7235acee4d11d67e91e3fe3d3a236 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 16:57:41 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ac5dd94..3fb2270a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,4 +25,4 @@ jobs: #- run: sudo apt-get update && sudo apt-get install make # Verify #- run: cd tests/lean && make - - cd tests/lean && lake build + - run: cd tests/lean && lake build -- cgit v1.2.3 From a3a1a5e603905fb2bcdf7f05a14282366998b1c4 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:00:18 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb2270a..a958910b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,13 @@ jobs: #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 lean: # Lean isn't supported by Nix, so we need to add extra steps - runs-on: [self-hosted, linux] + runs-on: [ubuntu-latest] steps: + # Install curl + - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh #- run: sudo apt-get update && sudo apt-get install make # Verify - #- run: cd tests/lean && make - - run: cd tests/lean && lake build + - run: cd tests/lean && make + #- run: cd tests/lean && lake build -- cgit v1.2.3 From 27eb90fc61a45f8a8c5f1279082b0210d285bbc1 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:01:48 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a958910b..48392ccc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: # Install curl - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) - - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + - run: curl -y https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh #- run: sudo apt-get update && sudo apt-get install make # Verify - run: cd tests/lean && make -- cgit v1.2.3 From f00da97a17e4d8445fc74303b907b57b1fbddb1e Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:03:32 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48392ccc..a00c6a24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ jobs: # Install curl - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) - - run: curl -y https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf -y | sh #- run: sudo apt-get update && sudo apt-get install make # Verify - - run: cd tests/lean && make + - run: cd aeneas/tests/lean && make #- run: cd tests/lean && lake build -- cgit v1.2.3 From 5c42ee7194833679264583cf81b0c32898fbb9f2 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:04:16 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a00c6a24..7609ee29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,10 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-tests - run: nix build -L .#checks.x86_64-linux.aeneas-verify-fstar - run: nix build -L .#checks.x86_64-linux.aeneas-verify-coq + # HOL4 can be reactivated + #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 + # Lean doesn't work with Nix #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean - - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 lean: # Lean isn't supported by Nix, so we need to add extra steps runs-on: [ubuntu-latest] steps: -- cgit v1.2.3 From 3be02779a3f0decd3e45e1faed6d83992cfb0f0b Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:08:10 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7609ee29..8c590a9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,20 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-tests - run: nix build -L .#checks.x86_64-linux.aeneas-verify-fstar - run: nix build -L .#checks.x86_64-linux.aeneas-verify-coq - # HOL4 can be reactivated + # HOL4 can be reactivated, but it is very slow #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 # Lean doesn't work with Nix #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean lean: # Lean isn't supported by Nix, so we need to add extra steps runs-on: [ubuntu-latest] steps: + - run: wget -q https://raw.githubusercontent.com/leanprover-community/mathlib4/master/scripts/install_debian.sh && bash install_debian.sh ; rm -f install_debian.sh && source ~/.profile # Install curl - - run: sudo apt update && sudo apt install curl + #- run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) - - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf -y | sh + #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf -y | sh #- run: sudo apt-get update && sudo apt-get install make # Verify - - run: cd aeneas/tests/lean && make + - run: ls + - run: cd tests/lean && make #- run: cd tests/lean && lake build -- cgit v1.2.3 From 4fa2953684e6cb1763b05fd9d392477d04567aaf Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:13:37 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c590a9d..328aaf22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,13 +22,14 @@ jobs: lean: # Lean isn't supported by Nix, so we need to add extra steps runs-on: [ubuntu-latest] steps: - - run: wget -q https://raw.githubusercontent.com/leanprover-community/mathlib4/master/scripts/install_debian.sh && bash install_debian.sh ; rm -f install_debian.sh && source ~/.profile + - run: ls + #- run: wget -q https://raw.githubusercontent.com/leanprover-community/mathlib4/master/scripts/install_debian.sh && bash install_debian.sh ; rm -f install_debian.sh && source ~/.profile # Install curl - #- run: sudo apt update && sudo apt install curl + - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) - #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf -y | sh + #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -y #- run: sudo apt-get update && sudo apt-get install make # Verify - - run: ls - run: cd tests/lean && make #- run: cd tests/lean && lake build -- cgit v1.2.3 From f2fd214f6aace2f4dd92411291c2760dadd88116 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:15:49 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 328aaf22..db63f8e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh - - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -y + - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -- -y #- run: sudo apt-get update && sudo apt-get install make # Verify - run: cd tests/lean && make -- cgit v1.2.3 From f64cb8cd52871cf5463b68986e6d39e2c133313d Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:19:39 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db63f8e3..7904509b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,14 +22,17 @@ jobs: lean: # Lean isn't supported by Nix, so we need to add extra steps runs-on: [ubuntu-latest] steps: - - run: ls #- run: wget -q https://raw.githubusercontent.com/leanprover-community/mathlib4/master/scripts/install_debian.sh && bash install_debian.sh ; rm -f install_debian.sh && source ~/.profile # Install curl - run: sudo apt update && sudo apt install curl # Install Elan (https://leanprover-community.github.io/install/linux.html) + # We updated the script to make it run in non-interactive mode #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -- -y #- run: sudo apt-get update && sudo apt-get install make + # Checkout the repo and download it to the runner + - name: Checkout + uses: actions/checkout@v4 # Verify - run: cd tests/lean && make #- run: cd tests/lean && lake build -- cgit v1.2.3 From e74bbd8c4b14686b2886754607036fe4f84d1d49 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:21:22 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7904509b..2ea5dc4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,17 +22,13 @@ jobs: lean: # Lean isn't supported by Nix, so we need to add extra steps runs-on: [ubuntu-latest] steps: - #- run: wget -q https://raw.githubusercontent.com/leanprover-community/mathlib4/master/scripts/install_debian.sh && bash install_debian.sh ; rm -f install_debian.sh && source ~/.profile # Install curl - run: sudo apt update && sudo apt install curl - # Install Elan (https://leanprover-community.github.io/install/linux.html) - # We updated the script to make it run in non-interactive mode - #- run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | sh + # Install Elan (https://leanprover-community.github.io/install/linux.html) and Lean in + # non-interactive mode: - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -- -y - #- run: sudo apt-get update && sudo apt-get install make # Checkout the repo and download it to the runner - name: Checkout uses: actions/checkout@v4 # Verify - run: cd tests/lean && make - #- run: cd tests/lean && lake build -- cgit v1.2.3 From 2331b4c0d45fd47bae95e4d3380044973e4477e0 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:22:25 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ea5dc4f..32f2dab0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: # Install Elan (https://leanprover-community.github.io/install/linux.html) and Lean in # non-interactive mode: - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -- -y + - run: source ~/.profile # Checkout the repo and download it to the runner - name: Checkout uses: actions/checkout@v4 -- cgit v1.2.3 From 57ffe2c9b46e196310f0abd6c001751fe2f2a6b9 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:25:47 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32f2dab0..82b7e724 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,8 @@ jobs: # Install Elan (https://leanprover-community.github.io/install/linux.html) and Lean in # non-interactive mode: - run: curl https://raw.githubusercontent.com/leanprover/elan/master/elan-init.sh -sSf | bash -s -- -y - - run: source ~/.profile # Checkout the repo and download it to the runner - name: Checkout uses: actions/checkout@v4 # Verify - - run: cd tests/lean && make + - run: source ~/.profile && cd tests/lean && make -- cgit v1.2.3 From d527795cb5c24892617bd5f7df75450e50069194 Mon Sep 17 00:00:00 2001 From: Son Ho Date: Fri, 10 Nov 2023 17:30:23 +0100 Subject: Update the ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82b7e724..6b5aacf0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,10 @@ jobs: - run: nix build -L .#checks.x86_64-linux.aeneas-tests - run: nix build -L .#checks.x86_64-linux.aeneas-verify-fstar - run: nix build -L .#checks.x86_64-linux.aeneas-verify-coq - # HOL4 can be reactivated, but it is very slow - #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 + - run: nix build -L .#checks.x86_64-linux.aeneas-verify-hol4 # Lean doesn't work with Nix #- run: nix build -L .#checks.x86_64-linux.aeneas-verify-lean - lean: # Lean isn't supported by Nix, so we need to add extra steps + lean: # Lean isn't supported by Nix, so we put it in a different job runs-on: [ubuntu-latest] steps: # Install curl @@ -30,5 +29,6 @@ jobs: # Checkout the repo and download it to the runner - name: Checkout uses: actions/checkout@v4 - # Verify + # Verify - note that we need to update the environment with `source` so + # that the lake binary is in the path. - run: source ~/.profile && cd tests/lean && make -- cgit v1.2.3