From b352ee0e67b8bbd09696514ccd483ac92b4725e3 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 16 Sep 2024 17:25:07 +0100 Subject: [PATCH] test: use correct matrix syntax --- .forgejo/workflows/test.yml | 12 +++++++++--- Dockerfile | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 5434bd4..54079b4 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -5,20 +5,26 @@ on: jobs: test: runs-on: docker + strategy: + matrix: + toolchain: + - name: stable + - name: nightly + steps: - uses: actions/checkout@v4 - name: Test uses: https://git.kemitix.net/kemitix/rust@next with: - args: cargo test + args: ${{ matrix.toolchain.name }} cargo test - name: Build uses: https://git.kemitix.net/kemitix/rust@next with: - args: cargo build + args: ${{ matrix.toolchain.name }} cargo build - name: Run uses: https://git.kemitix.net/kemitix/rust@next with: - args: cargo run + args: ${{ matrix.toolchain.name }} cargo run diff --git a/Dockerfile b/Dockerfile index 0eae36e..0803b86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ FROM docker.io/rust:1.81.0-slim-bookworm # git - git RUN apt-get update \ && \ - apt-get satisfy -y "nodejs (>=18.19.0) curl (>=7.88.1) pkg-config (>=1.8.1) libssl-dev (>=3.0.14) git (>=2.39.2)" \ + apt-get satisfy -y "nodejs (>=18.19.0), curl (>=7.88.1), pkg-config (>=1.8.1), libssl-dev (>=3.0.14), git (>=2.39.2)" \ && \ rm -r /var/lib/apt/lists/*