TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'adjust-to-rust-version-bumps' into 'next'

Browse source 
chore(ci): Adjust to rust version bumps

See merge request famedly/conduit!479
This commit is contained in:
Timo Kösters 2023-06-10 15:35:22 +00:00
commit def079267d
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -110,7 +110,7 @@ docker:tags:
cargo check: cargo check:
stage: test stage: test
image: docker.io/rust:1.69.0-bullseye image: docker.io/rust:1.70.0-bullseye
needs: [] needs: []
interruptible: true interruptible: true
before_script: before_script:
@ -135,11 +135,7 @@ test:cargo:
- apt-get update && apt-get -y --no-install-recommends install libclang-dev # dependency for rocksdb - apt-get update && apt-get -y --no-install-recommends install libclang-dev # dependency for rocksdb
script: script:
- rustc --version && cargo --version # Print version info for debugging - rustc --version && cargo --version # Print version info for debugging
- "cargo test --color always --workspace --verbose --locked --no-fail-fast -- -Z unstable-options --format json | gitlab-report -p test > $CI_PROJECT_DIR/report.xml" - "cargo test --color always --workspace --verbose --locked --no-fail-fast"
artifacts:
when: always
reports:
junit: report.xml
test:clippy: test:clippy:
extends: .test-shared-settings extends: .test-shared-settings

6
Dockerfile
View file

@ -1,5 +1,7 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM docker.io/rust:1.69-bullseye AS builder FROM docker.io/rust:1.70-bullseye AS base
FROM base AS builder
WORKDIR /usr/src/conduit WORKDIR /usr/src/conduit
# Install required packages to build Conduit and it's dependencies # Install required packages to build Conduit and it's dependencies
@ -37,7 +39,7 @@ COPY --from=builder /usr/src/conduit/target/release/conduit /conduit
# --------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------
# Build cargo-deb, a tool to package up rust binaries into .deb packages for Debian/Ubuntu based systems: # Build cargo-deb, a tool to package up rust binaries into .deb packages for Debian/Ubuntu based systems:
# --------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------
FROM docker.io/rust:1.69-bullseye AS build-cargo-deb FROM base AS build-cargo-deb
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \