mirror of
https://gitlab.com/famedly/conduit.git
synced 2024-12-26 08:04:20 +01:00
chore(ci): Adjust to rust version bumps
This commit is contained in:
parent
808b12f618
commit
a3a9b60abc
2 changed files with 6 additions and 8 deletions
|
@ -110,7 +110,7 @@ docker:tags:
|
|||
|
||||
cargo check:
|
||||
stage: test
|
||||
image: docker.io/rust:1.69.0-bullseye
|
||||
image: docker.io/rust:1.70.0-bullseye
|
||||
needs: []
|
||||
interruptible: true
|
||||
before_script:
|
||||
|
@ -135,11 +135,7 @@ test:cargo:
|
|||
- apt-get update && apt-get -y --no-install-recommends install libclang-dev # dependency for rocksdb
|
||||
script:
|
||||
- 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"
|
||||
artifacts:
|
||||
when: always
|
||||
reports:
|
||||
junit: report.xml
|
||||
- "cargo test --color always --workspace --verbose --locked --no-fail-fast"
|
||||
|
||||
test:clippy:
|
||||
extends: .test-shared-settings
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
# 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
|
||||
|
||||
# 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:
|
||||
# ---------------------------------------------------------------------------------------------------------------
|
||||
FROM docker.io/rust:1.69-bullseye AS build-cargo-deb
|
||||
FROM base AS build-cargo-deb
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends \
|
||||
|
|
Loading…
Reference in a new issue