Skip to content

Commit 16feb35

Browse files
committed
DEBUG fix matrix again, activate real proof step
1 parent 56e5f22 commit 16feb35

File tree

1 file changed

+40
-61
lines changed

1 file changed

+40
-61
lines changed

.github/workflows/publish-js-client.yml

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,13 @@ jobs:
4444
- name: "Set up nix shell"
4545
uses: rrbutani/use-nix-shell-action@v1
4646
with:
47-
flakes: nixpkgs#hello,nixpkgs#docker,github:runtimeverification/stable-mir-json/${{ env.smir }}
48-
- name: "Use things from nix shell"
49-
run: |
50-
hello
51-
command -v docker
52-
which stable_mir_json
47+
flakes: github:runtimeverification/stable-mir-json/${{ inputs.smir }}
48+
5349
- name: "Build with stable_mir_json"
5450
run: |
5551
cd p-token
5652
RUSTC=stable_mir_json cargo build --features runtime-verification
5753
58-
# - name: "Test nix action"
59-
# uses: workflow/nix-shell-action@v3
60-
# with:
61-
# flakes: nixpkgs#hello,nixpkgs#docker
62-
# script: |
63-
# hello
64-
# command -v docker
65-
66-
# - name: "Build with stable_mir_json"
67-
# uses: workflow/nix-shell-action@v3
68-
# with:
69-
# flakes: github:runtimeverification/stable-mir-json/${{ env.smir }}
70-
# script: |
71-
# which stable_mir_json
72-
# cd p-token
73-
# RUSTC=stable_mir_json cargo build --features runtime-verification
7454
- name: "Store SMIR JSON files"
7555
uses: actions/upload-artifact@v4
7656
with:
@@ -88,8 +68,8 @@ jobs:
8868
- name: "Create Proof Array"
8969
id: split
9070
run: |
91-
echo "proofs = '${{ env.proofs }}'"
92-
echo "matrix=${{ env.proofs }}" >> $GITHUB_OUTPUT
71+
echo "proofs = '${{ inputs.proofs }}'"
72+
echo "matrix=${{ inputs.proofs }}" >> $GITHUB_OUTPUT
9373
9474
run_proof:
9575
name: "Link SMIR and Run Proofs"
@@ -108,40 +88,39 @@ jobs:
10888
- name: debug matrix and docker image
10989
run: |
11090
echo "This is proof ${{ matrix.proof }}"
111-
echo "Running with docker image runtimeverificationinc/kmir:${{ env.kmir }}"
112-
- name: Fail
113-
run: exit 1
114-
# - name: "Checkout"
115-
# uses: actions/checkout@v4
116-
117-
# - name: "Set up Docker host"
118-
# run: |
119-
# docker run --rm --detach \
120-
# --user github-user \
121-
# -v $PWD:/workdir --workdir /workdir \
122-
# --name "${RUNNER_NAME}" \
123-
# runtimeverificationinc/kmir:${{ inputs.kmir }}
124-
# sleep 10
125-
126-
# - name: "Get SMIR Files"
127-
# uses: actions/download-artifact@v5
128-
# with:
129-
# name: p-token.smir
130-
# path: p-token/test-properties/artefacts/
131-
132-
# - name: "Link SMIR Files"
133-
# run: |
134-
# docker exec --user github-user --workdir /workdir/p-token/test-properties/artefacts/ "${RUNNER_NAME}" \
135-
# bash -c 'kmir link -o p-token.smir.json *.smir.json'
136-
137-
# - name: "Run Proof ${{ matrix.proof }} with default proof settings"
138-
# run: |
139-
# docker exec --user github-user --workdir /workdir/p-token/test-properties/ "${RUNNER_NAME}" \
140-
# ./run-proofs.sh ${{ matrix.proof }}'
141-
142-
# - name: "Shut down docker image"
143-
# if: always
144-
# run: |
145-
# docker stop ${RUNNER_NAME}
146-
# sleep 5
147-
# docker rm -f ${RUNNER_NAME}
91+
echo "Running with docker image runtimeverificationinc/kmir:${{ inputs.kmir }}"
92+
93+
- name: "Checkout"
94+
uses: actions/checkout@v4
95+
96+
- name: "Set up Docker host"
97+
run: |
98+
docker run --rm --detach \
99+
--user github-user \
100+
-v $PWD:/workdir --workdir /workdir \
101+
--name "${RUNNER_NAME}" \
102+
runtimeverificationinc/kmir:${{ inputs.kmir }}
103+
sleep 10
104+
105+
- name: "Get SMIR Files"
106+
uses: actions/download-artifact@v5
107+
with:
108+
name: p-token.smir
109+
path: p-token/test-properties/artefacts/
110+
111+
- name: "Link SMIR Files"
112+
run: |
113+
docker exec --user github-user --workdir /workdir/p-token/test-properties/artefacts/ "${RUNNER_NAME}" \
114+
bash -c 'kmir link -o p-token.smir.json *.smir.json'
115+
116+
- name: "Run Proof ${{ matrix.proof }} with default proof settings"
117+
run: |
118+
docker exec --user github-user --workdir /workdir/p-token/test-properties/ "${RUNNER_NAME}" \
119+
./run-proofs.sh ${{ matrix.proof }}'
120+
121+
- name: "Shut down docker image"
122+
if: always()
123+
run: |
124+
docker stop ${RUNNER_NAME}
125+
sleep 5
126+
docker rm -f ${RUNNER_NAME}

0 commit comments

Comments
 (0)