Skip to content

Commit 62f730d

Browse files
committed
fix: broken gha cache
Also fix some clang warnings. Signed-off-by: Roman Gershman <roman@dragonflydb.io>
1 parent eb80d57 commit 62f730d

File tree

4 files changed

+8
-38
lines changed

4 files changed

+8
-38
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
lsblk -l
2828
echo "sda rotational = $(cat /sys/block/sda/queue/rotational)"
2929
echo "sdb rotational = $(cat /sys/block/sdb/queue/rotational)"
30-
- uses: actions/cache@v4
31-
with:
32-
path: ~/.cache/pre-commit
33-
key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
3430
- name: Run pre-commit checks
3531
run: |
3632
source venv/bin/activate
@@ -43,7 +39,8 @@ jobs:
4339
container: ["ubuntu-dev:20", "alpine-dev:latest"]
4440
build-type: [Debug, Release]
4541
compiler: [{ cxx: g++, c: gcc }]
46-
cxx_flags: ["-Werror"]
42+
# -no-pie to disable address randomization so we could symbolize stacktraces
43+
cxx_flags: ["-Werror", "-no-pie"]
4744
sanitizers: ["NoSanitizers"]
4845
include:
4946
- container: "alpine-dev:latest"
@@ -61,9 +58,6 @@ jobs:
6158
runs-on: ubuntu-latest
6259
env:
6360
SCCACHE_GHA_ENABLED: "true"
64-
SCCACHE_CACHE_SIZE: 6G
65-
SCCACHE_ERROR_LOG: /tmp/sccache_log.txt
66-
# SCCACHE_LOG: debug
6761

6862
container:
6963
image: ghcr.io/romange/${{ matrix.container }}
@@ -100,14 +94,7 @@ jobs:
10094
ls -la /mnt/foo
10195
10296
- name: Run sccache-cache
103-
uses: mozilla-actions/sccache-action@v0.0.7
104-
105-
- name: Configure Cache Env
106-
uses: actions/github-script@v7
107-
with:
108-
script: |
109-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
110-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
97+
uses: mozilla-actions/sccache-action@v0.0.8
11198

11299
- name: Configure CMake
113100
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -129,14 +116,13 @@ jobs:
129116
export USAN="ON"
130117
fi
131118
132-
# -no-pie to disable address randomization so we could symbolize stacktraces
133119
cmake -B ${GITHUB_WORKSPACE}/build \
134120
-DCMAKE_BUILD_TYPE=${{matrix.build-type}} \
135121
-GNinja \
136122
-DCMAKE_C_COMPILER="${{matrix.compiler.c}}" \
137123
-DCMAKE_CXX_COMPILER="${{matrix.compiler.cxx}}" \
138124
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache \
139-
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}} -no-pie" -DWITH_AWS:BOOL=OFF \
125+
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}}" -DWITH_AWS:BOOL=OFF \
140126
-DWITH_ASAN="${ASAN}" \
141127
-DWITH_USAN="${USAN}" \
142128
-L

.github/workflows/daily-builds.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,7 @@ jobs:
3838
with:
3939
submodules: true
4040
- name: Run sccache-cache
41-
uses: mozilla-actions/sccache-action@v0.0.7
42-
43-
- name: Configure Cache Env
44-
uses: actions/github-script@v7
45-
with:
46-
script: |
47-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
48-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
41+
uses: mozilla-actions/sccache-action@v0.0.8
4942

5043
- name: Install dependencies
5144
run: |
@@ -75,14 +68,7 @@ jobs:
7568
with:
7669
submodules: true
7770
- name: Run sccache-cache
78-
uses: mozilla-actions/sccache-action@v0.0.7
79-
80-
- name: Configure Cache Env
81-
uses: actions/github-script@v7
82-
with:
83-
script: |
84-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
85-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
71+
uses: mozilla-actions/sccache-action@v0.0.8
8672

8773
- name: Install dependencies
8874
run: |

src/server/dfly_main.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ constexpr size_t kFiberDefaultStackSize = 32_KB - 16;
108108
constexpr size_t kFiberDefaultStackSize = 40_KB - 16;
109109
#endif
110110

111-
using util::http::TlsClient;
112-
113111
enum class TermColor { kDefault, kRed, kGreen, kYellow };
114112
// Returns the ANSI color code for the given color. TermColor::kDefault is
115113
// an invalid input.
@@ -170,7 +168,7 @@ string NormalizePaths(std::string_view path) {
170168
}
171169

172170
template <typename... Args> unique_ptr<Listener> MakeListener(Args&&... args) {
173-
auto res = make_unique<Listener>(forward<Args>(args)...);
171+
auto res = make_unique<Listener>(std::forward<Args>(args)...);
174172
res->SetConnFiberStackSize(kFiberDefaultStackSize);
175173
return res;
176174
}

src/server/multi_command_squasher.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ bool MultiCommandSquasher::ExecuteSquashed(facade::RedisReplyBuilder* rb) {
246246
fb2::BlockingCounter bc(num_shards);
247247
DVLOG(1) << "Squashing " << num_shards << " " << tx->DebugId();
248248

249-
auto cb = [this, tx, bc, rb]() mutable {
249+
auto cb = [this, bc, rb]() mutable {
250250
this->SquashedHopCb(EngineShard::tlocal(), rb->GetRespVersion());
251251
bc->Dec();
252252
};

0 commit comments

Comments
 (0)