diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dd6eb0ef7..c2b566739 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,19 +33,3 @@ jobs: steps: - uses: seL4/ci-actions/style@master - mypy: - name: 'mypy on tool' - runs-on: ubuntu-latest - steps: - - name: Checkout Microkit repository - uses: actions/checkout@v3 - - name: Install mypy - run: | - sudo add-apt-repository ppa:deadsnakes/ppa - sudo apt update - sudo apt install python3.9 python3-pip python3.9-venv - python3.9 -m venv pyenv - ./pyenv/bin/pip install --upgrade pip setuptools wheel - ./pyenv/bin/pip install -r requirements.txt - - name: Run mypy - run: ./pyenv/bin/mypy tool/microkit diff --git a/.github/workflows/sdk.yaml b/.github/workflows/sdk.yaml index 78a4fdc22..beb256be7 100644 --- a/.github/workflows/sdk.yaml +++ b/.github/workflows/sdk.yaml @@ -30,6 +30,7 @@ jobs: path: seL4 - name: Install SDK dependencies run: | + rustup target add x86_64-unknown-linux-musl sudo apt update sudo apt install \ cmake pandoc device-tree-compiler ninja-build \ @@ -85,7 +86,9 @@ jobs: ref: microkit path: seL4 - name: Install SDK dependencies - run: brew install pandoc cmake dtc ninja qemu libxml2 python@3.9 coreutils texlive + run: | + rustup target add aarch64-apple-darwin + brew install pandoc cmake dtc ninja qemu libxml2 python@3.9 coreutils texlive - name: Install AArch64 GCC toolchain run: | wget -O aarch64-toolchain.tar.gz https://sel4-toolchains.s3.us-east-2.amazonaws.com/arm-gnu-toolchain-12.2.rel1-darwin-x86_64-aarch64-none-elf.tar.xz%3Frev%3D09b11f159fc24fdda01e05bb32695dd5%26hash%3D6AAF4239F28AE17389AB3E611DFFE0A6