Skip to content

Commit aaa450a

Browse files
committed
[test]
1 parent 3647050 commit aaa450a

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

.github/workflows/build-meson.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
env:
2121
RUST_VERSION: '1.88.0'
22-
CARGO_HOME: /usr/local/cargo
22+
SCCACHE_DIR: /cache/sccache
2323

2424
jobs:
2525
container:
@@ -63,16 +63,17 @@ jobs:
6363
- name: Restore sccache cache
6464
uses: actions/cache/restore@v4
6565
with:
66-
path: /cache/sccache
66+
path: ${{ env.SCCACHE_DIR }}
6767
key: sccache-${{ runner.arch }}-librustdeps-${{ github.sha }}
6868
restore-keys: |
6969
sccache-${{ runner.arch }}-librustdeps-
7070
7171
- name: Build librustdeps
7272
env:
73-
SCCACHE_DIR: /cache/sccache
7473
RUSTC_WRAPPER: sccache
74+
SCCACHE_LOG: debug
7575
run: |
76+
SCCACHE_NO_DAEMON=1 SCCACHE_START_SERVER=1 sccache 2>&1 &
7677
cd rust
7778
meson setup builddir -Dwith_grovedb_cxx=true
7879
meson compile -C builddir
@@ -99,7 +100,7 @@ jobs:
99100
github.ref_name == github.event.repository.default_branch
100101
uses: actions/cache/save@v4
101102
with:
102-
path: /cache/sccache
103+
path: ${{ env.SCCACHE_DIR }}
103104
key: sccache-${{ runner.arch }}-librustdeps-${{ github.sha }}
104105

105106
build-grovedb-cxx:
@@ -134,16 +135,17 @@ jobs:
134135
- name: Restore sccache cache
135136
uses: actions/cache/restore@v4
136137
with:
137-
path: /cache/sccache
138+
path: ${{ env.SCCACHE_DIR }}
138139
key: sccache-${{ runner.arch }}-grovedb-cxx-${{ github.sha }}
139140
restore-keys: |
140141
sccache-${{ runner.arch }}-grovedb-cxx-
141142
142143
- name: Build grovedb_cxx
143144
env:
144-
SCCACHE_DIR: /cache/sccache
145145
RUSTC_WRAPPER: sccache
146+
SCCACHE_LOG: debug
146147
run: |
148+
SCCACHE_NO_DAEMON=1 SCCACHE_START_SERVER=1 sccache 2>&1 &
147149
cd rust/grovedb_cxx
148150
meson setup builddir
149151
meson compile -C builddir
@@ -175,5 +177,5 @@ jobs:
175177
github.ref_name == github.event.repository.default_branch
176178
uses: actions/cache/save@v4
177179
with:
178-
path: /cache/sccache
180+
path: ${{ env.SCCACHE_DIR }}
179181
key: sccache-${{ runner.arch }}-grovedb-cxx-${{ github.sha }}

contrib/containers/meson/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ RUN set -ex; \
2323
RUN pip install --break-system-packages meson
2424

2525
ARG CXXBRIDGE_VERSION=1.0.192
26-
RUN cargo install cxxbridge-cmd@${CXXBRIDGE_VERSION} sccache \
26+
ARG SCCACHE_VERSION=0.12.0
27+
RUN cargo install cxxbridge-cmd@${CXXBRIDGE_VERSION} sccache@${SCCACHE_VERSION} \
2728
&& rm -rf /usr/local/cargo/registry
2829

2930
# Setup unprivileged user

0 commit comments

Comments
 (0)