Skip to content

Commit 8fd937c

Browse files
committed
fix(ci): switch to Ubuntu 24.04 for unvendored tests
Fixes: * Switch to Ubuntu 24.04, as the ubuntu-20.04 runner is no longer provided by GitHub Actions. Improvements: * Enable unvendored Google Benchmark and simdjson.
1 parent f94349d commit 8fd937c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/unvendored.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,33 +66,33 @@ jobs:
6666
run: ctest --build-config Debug --verbose
6767

6868
ubuntu:
69-
name: Ubuntu 20.04
70-
runs-on: ubuntu-20.04
69+
name: Ubuntu 24.04
70+
runs-on: ubuntu-24.04
7171
steps:
7272
- name: install dependencies
7373
run: |
7474
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
75+
libbenchmark-dev \
7576
libgmock-dev \
76-
libgtest-dev
77+
libgtest-dev \
78+
libsimdjson-dev
7779
7880
- name: checkout
7981
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
8082

8183
- name: configure
8284
run: |
83-
# TODO(strager): Use host Google Benchmark after this bug is fixed:
84-
# https://bugs.launchpad.net/ubuntu/+source/benchmark/+bug/1887872
85-
# TODO(strager): Use host Boost after Ubuntu upgrades to version 1.75
86-
# or newer:
87-
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=978748#15
88-
# TODO(strager): Use host simdjson after Ubuntu imports a stable
89-
# version from Debian.
85+
# HACK(strager): QUICK_LINT_JS_HAVE_WORKING_CHAR8_T is needed because
86+
# Arch's gmock doesn't link with -fchar8_t.
9087
cmake \
9188
-DCMAKE_EXE_LINKER_FLAGS=-ffat-lto-objects \
9289
-DCMAKE_BUILD_TYPE=Debug \
9390
-DBUILD_TESTING=YES \
9491
-DQUICK_LINT_JS_ENABLE_BENCHMARKS=YES \
92+
-DQUICK_LINT_JS_HAVE_WORKING_FCHAR8_T=NO \
93+
-DQUICK_LINT_JS_USE_BUNDLED_GOOGLE_BENCHMARK=NO \
9594
-DQUICK_LINT_JS_USE_BUNDLED_GOOGLE_TEST=NO \
95+
-DQUICK_LINT_JS_USE_BUNDLED_SIMDJSON=NO \
9696
-S . -B .
9797
shell: bash
9898
- name: build

0 commit comments

Comments
 (0)