Skip to content

Commit

Permalink
Make CI happy
Browse files Browse the repository at this point in the history
  • Loading branch information
IsaacKhor committed May 22, 2024
1 parent 9709365 commit 8e56da9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,18 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup Clang 18
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 18
# Temporarily revert to GCC to make GH actions happy
# - name: Setup Clang 18
# run: |
# wget https://apt.llvm.org/llvm.sh
# chmod +x llvm.sh
# sudo ./llvm.sh 18

- name: Install dependencies
run: |
sudo apt update
make install-deps
pip3 install meson
- name: Build
run: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ clean:
cd build-dbg; meson compile --clean

install-deps:
sudo apt install -y meson libfmt-dev libaio-dev librados-dev \
sudo apt install -y meson g++-14 mold libfmt-dev libaio-dev librados-dev \
libjemalloc-dev libboost-dev libradospp-dev \
liburing-dev pkg-config uuid-dev libnuma-dev libarchive-dev \
libibverbs-dev librdmacm-dev python3-pyelftools libcunit1-dev
Expand Down
8 changes: 4 additions & 4 deletions meson.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[binaries]
c = 'clang-18'
c_ld = 'lld-18'
cpp = 'clang++-18'
cpp_ld = 'lld-18'
c = 'gcc-14'
c_ld = 'mold'
cpp = 'g++-14'
cpp_ld = 'mold'

0 comments on commit 8e56da9

Please sign in to comment.