Skip to content

Commit af7fe1b

Browse files
committed
fix: CI
1 parent a77a064 commit af7fe1b

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ jobs:
4343

4444
- name: Set environment variables
4545
id: out
46-
env:
47-
HASH: ${{ hashFiles('Dockerfile.ci') }}
4846
run: |
4947
set -xeuo pipefail
48+
HASH=$(sha256sum Dockerfile.ci | cut -d ' ' -f 1)
5049
RUST_VERSION=$(yq -r '.toolchain.channel' rust-toolchain.toml)
5150
echo "rust_version=$RUST_VERSION" >> "$GITHUB_OUTPUT"
5251
echo "image=ghcr.io/${GITHUB_REPOSITORY,,}:${RUST_VERSION}-${HASH}" >> "$GITHUB_OUTPUT"
@@ -148,14 +147,6 @@ jobs:
148147
token: ${{ secrets.GITHUB_TOKEN }}
149148
args: --all-targets -- -D warnings
150149

151-
docker:
152-
if: ${{ hashFiles('Dockerfile') != '' }}
153-
runs-on: ubuntu-latest
154-
steps:
155-
- uses: actions/checkout@v4
156-
157-
- uses: docker/build-push-action@v5
158-
159150
docs:
160151
needs:
161152
- setup

Dockerfile.ci

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ ENV PATH="/root/.cargo/bin:${PATH}"
88

99
# Minimal system deps: ca-certificates, curl, git, protoc, build essentials for crates that need it
1010
RUN apt-get update && apt-get install -y --no-install-recommends \
11-
ca-certificates git clang curl libssl-dev build-essential protobuf-compiler gnupg \
11+
ca-certificates git clang curl libssl-dev build-essential protobuf-compiler gnupg pkg-config \
1212
&& apt-get clean \
1313
&& rm -rf /var/lib/apt/lists/*
1414

15+
RUN pkg-config --version
16+
1517
# Install Rust
1618
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y --profile default
1719
RUN rustup toolchain install ${RUST_TOOLCHAIN} \

0 commit comments

Comments
 (0)