Skip to content

Commit 26459b4

Browse files
committed
Combine workflows Materialize and Test
The materialization check is moved into the Release workflow.
1 parent b359704 commit 26459b4

File tree

3 files changed

+80
-80
lines changed

3 files changed

+80
-80
lines changed

.github/workflows/materialize.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 47 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,54 @@ on:
44
branches:
55
- master
66
jobs:
7+
check:
8+
name: 'Check'
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check out code
12+
uses: actions/[email protected]
13+
with:
14+
submodules: recursive
15+
16+
- name: Install Nix
17+
uses: cachix/install-nix-action@v12
18+
with:
19+
extra_nix_config: |
20+
substituters = http://cache.nixos.org https://hydra.iohk.io
21+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
22+
23+
- name: Install Cachix
24+
uses: cachix/cachix-action@v8
25+
with:
26+
name: runtimeverification
27+
extraPullNames: 'kore'
28+
skipPush: true
29+
30+
- name: Check materialization
31+
run: nix-build --arg checkMaterialization true -A project.stack-nix
32+
733
release:
834
name: 'Release'
935
runs-on: ubuntu-latest
1036
steps:
11-
- name: Check out code
12-
uses: actions/[email protected]
13-
with:
14-
submodules: recursive
15-
- name: Install Nix
16-
uses: cachix/install-nix-action@v12
17-
with:
18-
extra_nix_config: |
19-
substituters = http://cache.nixos.org https://hydra.iohk.io
20-
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
21-
- name: Install Cachix
22-
uses: cachix/cachix-action@v8
23-
with:
24-
name: runtimeverification
25-
signingKey: '${{ secrets.RUNTIMEVERIFICATION_CACHIX_SIGNING_KEY }}'
26-
extraPullNames: 'kore'
27-
- name: Build
28-
run: nix-build -A kore -A project.kore.checks
37+
- name: Check out code
38+
uses: actions/[email protected]
39+
with:
40+
submodules: recursive
41+
42+
- name: Install Nix
43+
uses: cachix/install-nix-action@v12
44+
with:
45+
extra_nix_config: |
46+
substituters = http://cache.nixos.org https://hydra.iohk.io
47+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
48+
49+
- name: Install Cachix
50+
uses: cachix/cachix-action@v8
51+
with:
52+
name: runtimeverification
53+
signingKey: '${{ secrets.RUNTIMEVERIFICATION_CACHIX_SIGNING_KEY }}'
54+
extraPullNames: 'kore'
55+
56+
- name: Build
57+
run: nix-build -A kore -A project.kore.checks

.github/workflows/test.yml

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,50 @@ name: "Test"
22
on:
33
pull_request:
44
push:
5+
branches-ignore:
6+
- 'master'
57
jobs:
6-
test-nix:
8+
nix:
79
name: 'Nix'
810
runs-on: ubuntu-latest
911
steps:
10-
- name: Check out code
11-
uses: actions/[email protected]
12-
with:
13-
submodules: recursive
12+
- name: Check out code
13+
uses: actions/[email protected]
14+
with:
15+
submodules: recursive
1416

15-
- name: Install Nix
16-
uses: cachix/install-nix-action@v12
17-
with:
18-
extra_nix_config: |
19-
substituters = http://cache.nixos.org https://hydra.iohk.io
20-
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
17+
- name: Install Nix
18+
uses: cachix/install-nix-action@v12
19+
with:
20+
extra_nix_config: |
21+
substituters = http://cache.nixos.org https://hydra.iohk.io
22+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
2123
22-
- name: Install Cachix
23-
uses: cachix/cachix-action@v8
24-
with:
25-
name: kore
26-
signingKey: '${{ secrets.KORE_CACHIX_SIGNING_KEY }}'
24+
- name: Install Cachix
25+
uses: cachix/cachix-action@v8
26+
with:
27+
name: kore
28+
signingKey: '${{ secrets.KORE_CACHIX_SIGNING_KEY }}'
29+
30+
- name: Materialize
31+
run: ./nix/rematerialize.sh
2732

28-
- name: Check materialization
29-
run: nix-build --arg checkMaterialization true -A project.stack-nix
33+
- name: Commit changes
34+
uses: stefanzweifel/[email protected]
35+
with:
36+
commit_message: 'Materialize Nix expressions'
37+
file_pattern: 'nix/'
3038

31-
- name: Build
32-
run: nix-build -A kore
39+
- name: Build
40+
run: nix-build -A kore
3341

34-
- name: Run unit tests
35-
run: nix-build -A project.kore.checks
42+
- name: Run unit tests
43+
run: nix-build -A project.kore.checks
3644

37-
- name: Check shell
38-
run: nix-shell --run "echo OK"
45+
- name: Check shell
46+
run: nix-shell --run "echo OK"
3947

40-
test-cabal:
48+
cabal:
4149
name: 'Cabal'
4250
runs-on: ubuntu-latest
4351
steps:

0 commit comments

Comments
 (0)