Skip to content

Commit 0224dd9

Browse files
committed
Cleanup build config
1 parent d13fb60 commit 0224dd9

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

.github/workflows/linux.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ jobs:
2828
build_type: Debug
2929
std: 20
3030
install: sudo apt install g++-11
31+
- cxx: g++-13
32+
build_type: Release
33+
std: 23
34+
install: sudo apt install g++-13
35+
shared: -DBUILD_SHARED_LIBS=ON
3136
- cxx: clang++-11
3237
build_type: Debug
3338
std: 17
@@ -40,25 +45,20 @@ jobs:
4045
fuzz: -DFMT_FUZZ=ON -DFMT_FUZZ_LINKMAIN=ON
4146
std: 17
4247
install: sudo apt install clang-11
43-
#- cxx: clang++-13
44-
# build_type: Debug
45-
# std: 20
46-
#- cxx: clang++-13
47-
# build_type: Debug
48-
# std: 20
49-
# cxxflags: -stdlib=libc++
50-
# install: sudo apt install libc++-13-dev libc++abi-13-dev
51-
- cxx: g++-13
52-
build_type: Release
53-
std: 23
54-
install: sudo apt install g++-13
55-
shared: -DBUILD_SHARED_LIBS=ON
48+
- cxx: clang++-14
49+
build_type: Debug
50+
std: 20
51+
- cxx: clang++-14
52+
build_type: Debug
53+
std: 20
54+
cxxflags: -stdlib=libc++
55+
install: sudo apt install libc++-14-dev libc++abi-14-dev
5656

5757
steps:
5858
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5959

6060
- name: Set timezone
61-
run: sudo timedatectl set-timezone 'Asia/Yekaterinburg'
61+
run: sudo timedatectl set-timezone 'Europe/Minsk'
6262

6363
- name: Install GCC 4.9
6464
run: |
@@ -94,7 +94,7 @@ jobs:
9494
- name: Install Clang 3.6
9595
run: |
9696
sudo apt update
97-
sudo apt install libtinfo5 libobjc4
97+
sudo apt install libtinfo5
9898
# https://code.launchpad.net/ubuntu/xenial/amd64/clang-3.6/1:3.6.2-3ubuntu2
9999
wget --no-verbose \
100100
http://launchpadlibrarian.net/230019046/libffi6_3.2.1-4_amd64.deb \

.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2929

3030
- name: Set timezone
31-
run: sudo systemsetup -settimezone 'Asia/Yekaterinburg'
31+
run: sudo systemsetup -settimezone 'Europe/Minsk'
3232

3333
- name: Select Xcode 14.3 (macOS 13)
3434
run: sudo xcode-select -s "/Applications/Xcode_14.3.app"

test/std-test.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,12 @@ TEST(std_test, format_atomic) {
383383

384384
#ifdef __cpp_lib_atomic_flag_test
385385
TEST(std_test, format_atomic_flag) {
386-
std::atomic_flag f = ATOMIC_FLAG_INIT;
386+
std::atomic_flag f;
387387
(void)f.test_and_set();
388388
EXPECT_EQ(fmt::format("{}", f), "true");
389389

390-
const std::atomic_flag cf = ATOMIC_FLAG_INIT;
390+
f.clear();
391+
const std::atomic_flag& cf = f;
391392
EXPECT_EQ(fmt::format("{}", cf), "false");
392393
}
393394
#endif // __cpp_lib_atomic_flag_test

0 commit comments

Comments
 (0)