-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ubuntu ships very old versions and it's cramping my style. (In particular, I want to be able to use Abseil logging.) While I'm here, add GCC 14 to the build matrix. ... and remove GCC 11 so that we continue to test with only the three most recent releases. Change-Id: If7eb226005d8d9e56d3523e6e255d29814646d10 Reviewed-on: https://code-review.googlesource.com/c/re2/+/63070 Reviewed-by: Alex Chernyakhovsky <[email protected]> Reviewed-by: Paul Wankadia <[email protected]>
- Loading branch information
Showing
2 changed files
with
14 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,26 +7,20 @@ permissions: | |
jobs: | ||
build-linux: | ||
runs-on: ubuntu-latest | ||
# The Benchmark package on Ubuntu 22.04 LTS is problematic whereas this | ||
# Docker container is based on Debian bookworm and has a newer version. | ||
container: gcc:13 | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
build_shared_libs: [OFF, ON] | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Install CMake | ||
run: | | ||
apt update -y | ||
apt install -y cmake | ||
shell: bash | ||
- name: Install Abseil, GoogleTest and Benchmark | ||
run: | | ||
apt update -y | ||
apt install -y libabsl-dev libgtest-dev libbenchmark-dev | ||
vcpkg update | ||
vcpkg install abseil gtest benchmark | ||
shell: bash | ||
- run: .github/cmake.sh -D BUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} | ||
- run: | | ||
.github/cmake.sh -D BUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} \ | ||
-D CMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake | ||
shell: bash | ||
build-macos: | ||
runs-on: macos-latest | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,6 +38,7 @@ jobs: | |
env: | ||
CC: clang-${{ matrix.ver }} | ||
CXX: clang++-${{ matrix.ver }} | ||
PKG_CONFIG_PATH: /usr/local/share/vcpkg/installed/x64-linux/lib/pkgconfig | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Install Clang ${{ matrix.ver }} | ||
|
@@ -50,26 +51,28 @@ jobs: | |
shell: bash | ||
- name: Install Abseil, GoogleTest and Benchmark | ||
run: | | ||
sudo apt update -y | ||
sudo apt install -y libabsl-dev libgtest-dev libbenchmark-dev | ||
vcpkg update | ||
vcpkg install abseil gtest benchmark | ||
shell: bash | ||
- run: make && make test | ||
shell: bash | ||
build-gcc: | ||
runs-on: ubuntu-latest | ||
# TODO(junyer): Switch back to `ubuntu-latest` when this becomes that. | ||
runs-on: ubuntu-24.04 | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
ver: [11, 12, 13] | ||
ver: [12, 13, 14] | ||
env: | ||
CC: gcc-${{ matrix.ver }} | ||
CXX: g++-${{ matrix.ver }} | ||
PKG_CONFIG_PATH: /usr/local/share/vcpkg/installed/x64-linux/lib/pkgconfig | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Install Abseil, GoogleTest and Benchmark | ||
run: | | ||
sudo apt update -y | ||
sudo apt install -y libabsl-dev libgtest-dev libbenchmark-dev | ||
vcpkg update | ||
vcpkg install abseil gtest benchmark | ||
shell: bash | ||
- run: make && make test | ||
shell: bash |