Skip to content

Commit c753838

Browse files
committed
CI: simplify workflow, fix build on newer GCC
- Drop build-ubuntu-old (redundant with Docker build on 22.04) - Drop build-macos-latest (not a target platform) - Update actions/checkout to v4 - Add -Wno-error=infinite-recursion to work around motd.cpp weak symbol stubs that GCC 13+ flags as infinite recursion - Use -j$(nproc) for faster builds
1 parent 75dd2dd commit c753838

1 file changed

Lines changed: 4 additions & 26 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
test-ubuntu-latest:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v4
1111
with:
1212
submodules: recursive
1313
- name: make
1414
run: |
1515
sudo apt-get update
1616
sudo apt-get -y remove libzstd || true
1717
sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
18-
make BUILD_TLS=yes -j2 KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
18+
make BUILD_TLS=yes -j$(nproc) KEYDB_CFLAGS='-Werror -Wno-error=infinite-recursion' KEYDB_CXXFLAGS='-Werror -Wno-error=infinite-recursion'
1919
- name: gen-cert
2020
run: ./utils/gen-test-certs.sh
2121
- name: test-tls
@@ -34,38 +34,16 @@ jobs:
3434
- name: rotation test
3535
run: |
3636
./runtest-rotation
37-
38-
build-ubuntu-old:
39-
runs-on: ubuntu-20.04
40-
steps:
41-
- uses: actions/checkout@v2
42-
with:
43-
submodules: recursive
44-
- name: make -j2
45-
run: |
46-
sudo apt-get update
47-
sudo apt-get -y remove libzstd || true
48-
sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
49-
make -j2
50-
51-
build-macos-latest:
52-
runs-on: macos-latest
53-
steps:
54-
- uses: actions/checkout@v2
55-
with:
56-
submodules: recursive
57-
- name: make
58-
run: make KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' -j2
5937
6038
build-libc-malloc:
6139
runs-on: ubuntu-latest
6240
steps:
63-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v4
6442
with:
6543
submodules: recursive
6644
- name: make
6745
run: |
6846
sudo apt-get update
6947
sudo apt-get -y remove libzstd || true
7048
sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
71-
make KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' MALLOC=libc -j2
49+
make KEYDB_CFLAGS='-Werror -Wno-error=infinite-recursion' KEYDB_CXXFLAGS='-Werror -Wno-error=infinite-recursion' MALLOC=libc -j$(nproc)

0 commit comments

Comments
 (0)