build: be more flexible in apt-get versions for docker image
All checks were successful
/ test (push) Successful in 1h0m55s
All checks were successful
/ test (push) Successful in 1h0m55s
Also merges as we can't build without both in place:
fix(build): revert invalid matrix syntax
Back out "test: verify matrix with stable and nightly"
This backs out commit 5fc345c0de
.
This commit is contained in:
parent
5fc345c0de
commit
d9532aa17a
2 changed files with 7 additions and 20 deletions
|
@ -5,26 +5,20 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: docker
|
runs-on: docker
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
toolchain:
|
|
||||||
- stable
|
|
||||||
- nightly
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Test ${{ toolchain}}
|
- name: Test
|
||||||
uses: https://git.kemitix.net/kemitix/rust@next
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
with:
|
with:
|
||||||
args: ${{toolchain}} cargo test
|
args: cargo test
|
||||||
|
|
||||||
- name: Build ${{ toolchain }}
|
- name: Build
|
||||||
uses: https://git.kemitix.net/kemitix/rust@next
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
with:
|
with:
|
||||||
args: ${{ toolchain }} cargo build
|
args: cargo build
|
||||||
|
|
||||||
- name: Run ${{ toolchain }}
|
- name: Run
|
||||||
uses: https://git.kemitix.net/kemitix/rust@next
|
uses: https://git.kemitix.net/kemitix/rust@next
|
||||||
with:
|
with:
|
||||||
args: ${{ toolchain }} cargo run
|
args: cargo run
|
||||||
|
|
|
@ -9,14 +9,7 @@ FROM docker.io/rust:1.81.0-slim-bookworm
|
||||||
# git - git
|
# git - git
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& \
|
&& \
|
||||||
apt-get install -y \
|
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)" \
|
||||||
--no-install-recommends \
|
|
||||||
nodejs=18.19.0+dfsg-6~deb12u2 \
|
|
||||||
curl=7.88.1-10+deb12u7 \
|
|
||||||
pkg-config=1.8.1-1 \
|
|
||||||
libssl-dev=3.0.14-1~deb12u2 \
|
|
||||||
libdbus-1-dev=1.14.10-1~deb12u1 \
|
|
||||||
git=1:2.39.2-1.1 \
|
|
||||||
&& \
|
&& \
|
||||||
rm -r /var/lib/apt/lists/*
|
rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue