Update dependency: deps/pyk_release (#282)

* deps/pyk_release: Set Version v0.1.531

* Set Version: 0.2.5

* kmir/{pyproject.toml,poetry.lock}: sync Poetry files

* deps/k_release: sync release file version 6.1.42

* flake.{nix,lock}: update Nix derivations

* deps/pyk_release: Set Version v0.1.532

* kmir/{pyproject.toml,poetry.lock}: sync Poetry files

* flake.{nix,lock}: update Nix derivations

* deps/pyk_release: Set Version v0.1.533

* kmir/{pyproject.toml,poetry.lock}: sync Poetry files

* flake.{nix,lock}: update Nix derivations

* deps/pyk_release: Set Version v0.1.534

* Set Version: 0.2.6

* kmir/{pyproject.toml,poetry.lock}: sync Poetry files

* flake.{nix,lock}: update Nix derivations

* Extend Nix testing to Mac Silicon and Linux (#284)

* Extend Nix testing to Mac Silicon and Linux 

Testing running our nix kmir testing on Mac Silicon.

* Set Version: 0.2.6

* Update test.yml

* Set Version: 0.2.7

---------

Co-authored-by: devops <[email protected]>
Co-authored-by: Bruce Collie <[email protected]>

* Updated README to show Mac Silicon unsupported for Docker direct call.

* correcting strange formatting error

---------

Co-authored-by: devops <[email protected]>
Co-authored-by: Freeman <[email protected]>
Co-authored-by: Bruce Collie <[email protected]>
Co-authored-by: dkcumming <[email protected]>

Author: 5 people

.github/workflows/test.yml

@@ -80,25 +80,17 @@ jobs:
   nix:
     name: 'Nix'
     needs: code-quality-checks
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - runner: [self-hosted, linux, normal]
+          - runner: [self-hosted, macOS, ARM64]
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 60
     steps:
       - name: 'Check out code'
         uses: actions/checkout@v3
-      - name: 'Install Nix'
-        uses: cachix/install-nix-action@v22
-        with:
-          install_url: https://releases.nixos.org/nix/nix-2.13.3/install
-          extra_nix_config: |
-            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-            substituters = http://cache.nixos.org https://hydra.iohk.io
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
-      - name: 'Install Cachix'
-        uses: cachix/cachix-action@v12
-        with:
-          name: k-framework
-          authToken: '${{ secrets.CACHIX_PUBLIC_TOKEN }}'
       - name: 'Nix Build KMIR'
         run: GC_DONT_GC=1 nix build . --extra-experimental-features 'nix-command flakes' --print-build-logs
       - name: 'Nix Test KMIR'
-        run: GC_DONT_GC=1 nix build --extra-experimental-features 'nix-command flakes' --print-build-logs .#kmir-test
+        run: GC_DONT_GC=1 nix build --extra-experimental-features 'nix-command flakes' --print-build-logs .#kmir-test

README.md

@@ -152,21 +152,22 @@ source set_env.sh
 
 ## Working with Docker
 We provide a Docker image for isolated testing, locally and in CI.
+NOTE: Mac Silicon hardware not supported.
 
 From the root of the repository:
   - Build the docker image (the `./deps/k_release` file pins the K version):
-    ```sh
-    docker build . --tag kmir-tests --build-arg K_COMMIT=$(cat deps/k_release) --file .github/workflows/Dockerfile
-    ```
+```sh
+docker build . --tag kmir-tests --build-arg K_COMMIT=$(cat deps/k_release) --file .github/workflows/Dockerfile
+```
    - Run the integration tests in a container:
-    ```sh
-    docker run --name kmir-container --rm --interactive --tty --detach --workdir /home/user kmir-tests &&
-    docker cp . kmir-container:/home/user &&
-    docker exec kmir-container chown -R user:user /home/user &&
-    docker exec --user user kmir-container make -C kmir test-integration
-    ```
-
-Note: you may need to run the `docker` commands with `sudo`, or start a superuser shell with `sudo -s`..
+```sh
+docker run --name kmir-container --rm --interactive --tty --detach --workdir /home/user kmir-tests &&
+docker cp . kmir-container:/home/user &&
+docker exec kmir-container chown -R user:user /home/user &&
+docker exec --user user kmir-container make -C kmir test-integration
+```
+
+Note: you may need to run the `docker` commands with `sudo`, or start a superuser shell with `sudo -s`.
 
 We use a similar workflow in CI actions defined in the `.github/` directory.
 

deps/k_release

@@ -1 +1 @@
-6.1.41
+6.1.42

deps/pyk_release

@@ -1 +1 @@
-v0.1.530
+v0.1.534

flake.lock

@@ -2,11 +2,11 @@
   description = " A flake for KMIR Semantics";
 
   inputs = {
-    k-framework.url = "github:runtimeverification/k/v6.1.41";
+    k-framework.url = "github:runtimeverification/k/v6.1.42";
     nixpkgs.follows = "k-framework/nixpkgs";
     flake-utils.follows = "k-framework/flake-utils";
     rv-utils.follows = "k-framework/rv-utils";
-    pyk.url = "github:runtimeverification/pyk/v0.1.530";
+    pyk.url = "github:runtimeverification/pyk/v0.1.534";
     nixpkgs-pyk.follows = "pyk/nixpkgs";
     poetry2nix.follows = "pyk/poetry2nix";
   };

flake.nix

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kmir"
-version = "0.2.6"
+version = "0.2.7"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
@@ -13,7 +13,7 @@ authors = [
 [tool.poetry.dependencies]
 python = "^3.10"
 filelock = "3.9.0"
-pyk = { git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.530" }
+pyk = { git = "https://github.com/runtimeverification/pyk.git", tag = "v0.1.534" }
 pytest-timeout = "2.1.0"
 
 [tool.poetry.group.dev.dependencies]

kmir/poetry.lock

@@ -2,4 +2,4 @@
 
 from .kmir import KMIR
 
-VERSION: Final = '0.2.6'
+VERSION: Final = '0.2.7'

kmir/pyproject.toml

@@ -1 +1 @@
-0.2.6
+0.2.7