Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update toolbox #20

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v2.1.1
uses: actions/checkout@v2.5.0
- uses: cachix/install-nix-action@v12
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
Expand All @@ -28,22 +28,22 @@ jobs:
fail-fast: false
matrix: ${{fromJson(needs.setup.outputs.matrix)}}
steps:
- uses: cachix/install-nix-action@v12
- uses: cachix/install-nix-action@v18
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- uses: cachix/cachix-action@v8
- uses: cachix/cachix-action@v12
with:
# Name of a cachix cache to push and pull/substitute
name: math-comp
extraPullNames: coq
# Authentication token for Cachix, needed only for private cache access
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Checkout
uses: actions/checkout@v2.1.1
uses: actions/checkout@v2.5.0
- name: Building mathcomp-full-shell target if required
run: |
overrides="{coq = \"${{ matrix.coq }}\"; mathcomp = \"${{ matrix.mc }}\";}"
storepath=$(nix eval "(\"\${import ./. {override = $overrides;}}\")")
storepath=$(nix eval --raw --impure --expr "import ./. {override = $overrides;}")
hash=$(echo $storepath | sed "s/\"//mg" | xargs basename | cut -d- -f1)
url=https://math-comp.cachix.org/$hash.narinfo
if curl --output /dev/null --silent --head --fail "$url"; then
Expand All @@ -58,10 +58,10 @@ jobs:
runs-on: ubuntu-latest
needs: builds
steps:
- uses: cachix/install-nix-action@v12
- uses: cachix/install-nix-action@v18
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- uses: cachix/cachix-action@v8
- uses: cachix/cachix-action@v12
with:
# Name of a cachix cache to push and pull/substitute
name: math-comp
Expand All @@ -70,13 +70,13 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
## does not work because the PR is updated only once
- name: Checkout
uses: actions/checkout@v2.1.1
uses: actions/checkout@v2.5.0
- name: Update README.md
id: set-nixenv
run: |
./update-readme.sh
- name: Commit README.md
uses: EndBug/add-and-commit@v7
uses: EndBug/add-and-commit@v9.1.1
with:
message: 'Updating README.md'
add: 'README.md'
2 changes: 1 addition & 1 deletion .nix/coq-nix-toolbox.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"c003251246e91fe279cd01348af89d73e36b02a3"
"cd64bd6bca24e9de1de19ecec8e2f47a97b0d20f"
3 changes: 3 additions & 0 deletions matrix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ with import <nixpkgs> {}; with builtins; with lib;
let
old-coq = [ "8.9" "8.8" "8.7" ];
mc-coq-set = {
"1.15.0" = [ "8.16" "8.15" "8.14" "8.13" ];
"1.14.0" = [ "8.15" "8.14" "8.13" "8.12" "8.11" ];
"1.13.0" = [ "8.14" "8.13" "8.12" "8.11" ];
"1.12.0" = [ "8.13" "8.12" "8.11" "8.10" ];
"1.11.0" = [ "8.12" "8.11" "8.10" ] ++ old-coq;
"1.10.0" = [ "8.11" "8.10" ] ++ old-coq;
Expand Down
4 changes: 0 additions & 4 deletions shells/.nix/nixpkgs.nix

This file was deleted.