Skip to content

Commit b14640e

Browse files
committed
Merge branch 'master' into sparse-bytes-lemmas
2 parents 46d9252 + 00f366c commit b14640e

26 files changed

+906
-809
lines changed

.github/workflows/master-push.yml

-15
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
matrix:
4242
include:
4343
- runner: normal
44-
- runner: macos-13
4544
- runner: ARM64
4645
runs-on: ${{ matrix.runner }}
4746
steps:
@@ -53,20 +52,6 @@ jobs:
5352
- name: 'Upgrade bash'
5453
if: ${{ contains(matrix.os, 'macos') }}
5554
run: brew install bash
56-
- name: 'Install Nix'
57-
if: ${{ matrix.runner == 'macos-13' }}
58-
uses: cachix/install-nix-action@v19
59-
with:
60-
install_url: https://releases.nixos.org/nix/nix-2.13.3/install
61-
extra_nix_config: |
62-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
63-
- name: 'Install Cachix'
64-
if: ${{ matrix.runner == 'macos-13' }}
65-
uses: cachix/cachix-action@v12
66-
with:
67-
name: k-framework
68-
signingKey: ${{ secrets.CACHIX_SIGNING_KEY }}
69-
skipPush: true
7055
- name: 'Build and cache KWASM'
7156
uses: workflow/[email protected]
7257
env:

.github/workflows/test-pr.yml

-16
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ jobs:
115115
matrix:
116116
include:
117117
- runner: normal
118-
- runner: macos-13
119118
- runner: ARM64
120119
needs: pykwasm-code-quality-checks
121120
runs-on: ${{ matrix.runner }}
@@ -126,21 +125,6 @@ jobs:
126125
with:
127126
# Check out pull request HEAD instead of merge commit.
128127
ref: ${{ github.event.pull_request.head.sha }}
129-
- name: 'Install Nix'
130-
if: ${{ matrix.runner == 'macos-13' }}
131-
uses: cachix/install-nix-action@v25
132-
with:
133-
install_url: https://releases.nixos.org/nix/nix-2.19.3/install
134-
extra_nix_config: |
135-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
136-
substituters = http://cache.nixos.org https://cache.iog.io
137-
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
138-
- name: 'Install Cachix'
139-
if: ${{ matrix.runner == 'macos-13' }}
140-
uses: cachix/cachix-action@v14
141-
with:
142-
name: k-framework
143-
authToken: ${{ secrets.CACHIX_PUBLIC_TOKEN }}
144128
- name: 'Build KWASM'
145129
run: GC_DONT_GC=1 nix build .#kwasm --extra-experimental-features 'nix-command flakes' --print-build-logs
146130
- name: 'Build KWASM-Pyk'

.github/workflows/update-version.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
run: |
4848
K_VERSION=v"$(cat deps/k_release)"
4949
sed -i 's! k-framework.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"! k-framework.url = "github:runtimeverification/k/'"${K_VERSION}"'"!' flake.nix
50-
sed -i 's! pyk.url = "github:runtimeverification/k/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+?dir=pyk"! pyk.url = "github:runtimeverification/k/'"${K_VERSION}"'?dir=pyk"!' flake.nix
5150
nix flake update
5251
git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true
5352
- name: 'Push updates'

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ RUN groupadd -g $GROUP_ID user && useradd -m -u $USER_ID -s /bin/sh -g user user
2626
USER user:user
2727
WORKDIR /home/user
2828

29-
RUN curl -sSL https://install.python-poetry.org | python3 - \
30-
&& poetry --version
29+
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.3 python3 -
3130

3231
RUN pip3 install --user \
3332
cytoolz \
3433
numpy
3534

36-
ENV PATH=/home/user/wabt/build:/home/user/.local/bin:$PATH
35+
ENV PATH=/home/user/.local/bin:$PATH
36+
37+
RUN poetry --version

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ tests/%.run-term: tests/%
5555
rm -rf tests/$*.$(TEST_CONCRETE_BACKEND)-out-term
5656

5757
tests/%.parse: tests/%
58-
K_OPTS='-Xmx16G -Xss512m' $(TEST) kast $< kast > $@-out
58+
K_OPTS='-Xmx16G -Xss512m' $(TEST) kast --output kore $< > $@-out
5959
rm -rf $@-out
6060

6161
tests/%.prove: tests/%

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ KWasm: Semantics of WebAssembly in K
66

77
---
88

9-
This repository presents a prototype formal semantics of [WebAssembly].
10-
It is currently under construction.
9+
This repository presents the formal semantics of [WebAssembly].
10+
KWasm is a mature and production-ready semantics for WebAssembly, actively developed and maintained since 2019.
11+
1112
For examples of current capabilities, see the unit tests under the `tests/simple` directory.
1213

1314
Repository Structure

deps/k_release

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.38
1+
7.1.191

0 commit comments

Comments
 (0)