Move Rust setup into Dockerfile (#543)

As part of
#542, we
noticed that the `Dockerfile` does not install Rust, and we need it for
integration tests run there. This PR makes sure `rustc` and `cargo` are
available to run in the docker image for CI:

- The `rustup` install step is moved to inside the docker image.
- The steps for building KMir in the tests "Integration with
stable-mir-json" are all moved to being in the docker image.

---------

Co-authored-by: devops <devops@runtimeverification.com>

Author: ehildenb

.github/workflows/Dockerfile

@@ -13,6 +13,11 @@ ARG GROUP_ID=1000
 RUN groupadd -g ${GROUP_ID} ${GROUP} && useradd -m -u ${USER_ID} -s /bin/sh -g ${GROUP} ${USER}
 USER ${USER}:${GROUP}
 
+ENV PATH="/home/${USER}/.cargo/bin:${PATH}"
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
+RUN rustup toolchain install nightly-2024-11-29 --component llvm-tools --component rustc-dev --component rust-src
+RUN rustup default nightly-2024-11-29-x86_64-unknown-linux-gnu
+
 RUN mkdir /home/${USER}/workspace
 WORKDIR /home/${USER}/workspace
 

.github/workflows/test.yml

@@ -87,35 +87,16 @@ jobs:
         with:
           token: ${{ secrets.JENKINS_GITHUB_PAT }}
           submodules: recursive
-
-      - name: "Set up nightly Rust" # https://github.com/rust-lang/rustup/issues/3409
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-11-29 # Hardcoded version, same as stable-mir-json
-
-      - name: 'remove override'
-        run: |
-          cd deps/stable-mir-json
-          rustup override unset
-          rustup override unset --nonexistent
-          rustup toolchain uninstall stable-mir-json | echo "rustup toolchain uninstall stable-mir-json: FAILED"
-          rustup toolchain remove stable-mir-json | echo "rustup toolchain remove stable-mir-json: FAILED"
-
-      - name: 'Build stable-mir-json'
-        run: |
-          make stable-mir-json
-
       - name: 'Set up Docker'
         uses: ./.github/actions/with-docker
         with:
           container-name: mir-smir-ci-${{ github.sha }}
-
+      - name: 'Build stable-mir-json'
+        run: docker exec --user github-user mir-smir-ci-${GITHUB_SHA} make stable-mir-json
       - name: 'Build kmir (within docker)'
         run: docker exec --user github-user mir-smir-ci-${GITHUB_SHA} make build
-
       - name: 'Run parser tests (within docker)'
         run: docker exec --user github-user mir-smir-ci-${GITHUB_SHA} make smir-parse-tests
-
       - name: 'Tear down Docker'
         if: always()
         run: docker stop --time 0 mir-smir-ci-${GITHUB_SHA}

kmir/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kmir"
-version = "0.3.126"
+version = "0.3.127"
 description = ""
 requires-python = "~=3.10"
 dependencies = [

kmir/src/kmir/__init__.py

@@ -1,3 +1,3 @@
 from typing import Final
 
-VERSION: Final = '0.3.126'
+VERSION: Final = '0.3.127'

package/version

@@ -1 +1 @@
-0.3.126
+0.3.127