[pull] main from google:main

.bazelrc

@@ -8,14 +8,13 @@ build --features=layering_check
 build --features=parse_headers
 
 # Abseil requires C++14 at minimum.
-# Previously, the flag was set via `BAZEL_CXXOPTS`. On macOS, we also had to set
-# `BAZEL_USE_CPP_ONLY_TOOLCHAIN` since Bazel wouldn't respect the former without
-# the latter. However, the latter stopped Bazel from using Xcode and `-framework
-# Foundation`, which CCTZ (vendored into Abseil) requires.
 build --enable_platform_specific_config
 build:linux --cxxopt=-std=c++14
 build:macos --cxxopt=-std=c++14
 build:windows --cxxopt=/std:c++14
 
 # Print test logs for failed tests.
 test --test_output=errors
+
+# https://bazel.build/configure/best-practices#bazelrc-file
+try-import %workspace%/user.bazelrc

.github/bazel.sh

@@ -1,24 +1,25 @@
 #!/bin/bash
 set -eux
 
-bazel clean
-bazel build --compilation_mode=dbg -- //:all
-bazel test  --compilation_mode=dbg -- //:all \
-  -//:dfa_test \
-  -//:exhaustive1_test \
-  -//:exhaustive2_test \
-  -//:exhaustive3_test \
-  -//:exhaustive_test \
-  -//:random_test
+# Disable MSYS/MSYS2 path conversion, which interferes with Bazel.
+export MSYS_NO_PATHCONV='1'
+export MSYS2_ARG_CONV_EXCL='*'
 
-bazel clean
-bazel build --compilation_mode=opt -- //:all
-bazel test  --compilation_mode=opt -- //:all \
-  -//:dfa_test \
-  -//:exhaustive1_test \
-  -//:exhaustive2_test \
-  -//:exhaustive3_test \
-  -//:exhaustive_test \
-  -//:random_test
+for compilation_mode in dbg opt
+do
+  bazel clean
+  bazel build --compilation_mode=${compilation_mode} -- \
+    //:re2 \
+    //python:re2
+  bazel test  --compilation_mode=${compilation_mode} -- \
+    //:all \
+    -//:dfa_test \
+    -//:exhaustive1_test \
+    -//:exhaustive2_test \
+    -//:exhaustive3_test \
+    -//:exhaustive_test \
+    -//:random_test \
+    //python:all
+done
 
 exit 0

.github/cmake.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 set -eux
 
-cmake . -D CMAKE_BUILD_TYPE=Debug -D RE2_BUILD_TESTING=ON "$@"
-cmake --build . --config Debug --clean-first
-ctest -C Debug --output-on-failure -E 'dfa|exhaustive|random'
-
-cmake . -D CMAKE_BUILD_TYPE=Release -D RE2_BUILD_TESTING=ON "$@"
-cmake --build . --config Release --clean-first
-ctest -C Release --output-on-failure -E 'dfa|exhaustive|random'
+for CMAKE_BUILD_TYPE in Debug Release
+do
+  cmake . -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -D RE2_BUILD_TESTING=ON "$@"
+  cmake --build . --config ${CMAKE_BUILD_TYPE} --clean-first
+  ctest -C ${CMAKE_BUILD_TYPE} --output-on-failure -E 'dfa|exhaustive|random'
+done
 
 exit 0

.github/workflows/ci-bazel.yml

@@ -14,7 +14,9 @@ jobs:
     env:
       BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: bazelbuild/setup-bazelisk@v3
+      - uses: actions/checkout@v4.1.1
+      - uses: bazel-contrib/setup-bazel@0.8.1
+        with:
+          bazelisk-version: '1.x'
       - run: .github/bazel.sh
         shell: bash

.github/workflows/ci-cmake.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         build_shared_libs: [OFF, ON]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install CMake
         run: |
           apt update -y
@@ -35,7 +35,7 @@ jobs:
       matrix:
         build_shared_libs: [OFF, ON]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install Abseil, GoogleTest and Benchmark
         run: |
           brew update
@@ -50,7 +50,7 @@ jobs:
       matrix:
         build_shared_libs: [OFF, ON]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install Abseil, GoogleTest and Benchmark
         run: |
           vcpkg update

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       # (The other two flags are the default provided for CXXFLAGS in Makefile.)
       CXXFLAGS: -O3 -g -std=c++${{ matrix.ver }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install Abseil, GoogleTest and Benchmark
         run: |
           brew update
@@ -34,12 +34,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ver: [15, 16, 17]
+        ver: [16, 17, 18]
     env:
       CC: clang-${{ matrix.ver }}
       CXX: clang++-${{ matrix.ver }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install Clang ${{ matrix.ver }}
         run: |
           # Avoid `Conflicts: python3-lldb-x.y` between packages.
@@ -65,7 +65,7 @@ jobs:
       CC: gcc-${{ matrix.ver }}
       CXX: g++-${{ matrix.ver }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       - name: Install Abseil, GoogleTest and Benchmark
         run: |
           sudo apt update -y

.github/workflows/pages.yml

@@ -17,11 +17,13 @@ jobs:
       # Bazel fails if the username is unknown.
       USER: runner
     steps:
-      - uses: actions/checkout@v4
-      - uses: bazelbuild/setup-bazelisk@v3
+      - uses: actions/checkout@v4.1.1
+      - uses: bazel-contrib/setup-bazel@0.8.1
+        with:
+          bazelisk-version: '1.x'
       - run: app/build.sh
         shell: bash
-      - uses: actions/upload-pages-artifact@v3
+      - uses: actions/upload-pages-artifact@v3.0.1
         with:
           path: app/deploy
   deploy:
@@ -35,5 +37,5 @@ jobs:
     environment: github-pages
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/deploy-pages@v4
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/deploy-pages@v4.0.4

.github/workflows/pr.yml

@@ -15,8 +15,8 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/github-script@v7
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/github-script@v7.0.1
         with:
           script: |
             const fs = require('fs');

.github/workflows/python.yml

@@ -31,11 +31,13 @@ jobs:
       # Bazel fails if the username is unknown.
       USER: runner
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       # Stash the timestamp for the commit SHA that triggered the workflow.
       - run: echo "timestamp=$(git log -1 --pretty=%ct)" >> "${GITHUB_ENV}"
         shell: bash
-      - uses: bazelbuild/setup-bazelisk@v3
+      - uses: bazel-contrib/setup-bazel@0.8.1
+        with:
+          bazelisk-version: '1.x'
       - name: Prepare Python ${{ matrix.ver }} environment
         run: |
           "${PYTHON}" -m pip install --upgrade pip
@@ -56,7 +58,7 @@ jobs:
           "${PYTHON}" re2_test.py
         shell: bash
         working-directory: python
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ hashFiles('python/google_re2-*.whl') }}
           path: python/google_re2-*.whl
@@ -82,12 +84,14 @@ jobs:
       # Otherwise, Python refuses to install the built wheel!
       SYSTEM_VERSION_COMPAT: 0
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       # Stash the timestamp for the commit SHA that triggered the workflow.
       - run: echo "timestamp=$(git log -1 --pretty=%ct)" >> "${GITHUB_ENV}"
         shell: bash
-      - uses: bazelbuild/setup-bazelisk@v3
-      - uses: actions/setup-python@v5
+      - uses: bazel-contrib/setup-bazel@0.8.1
+        with:
+          bazelisk-version: '1.x'
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.ver }}
       - name: Prepare Python ${{ matrix.ver }} environment
@@ -111,7 +115,7 @@ jobs:
           python re2_test.py
         shell: bash
         working-directory: python
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ hashFiles('python/google_re2-*.whl') }}
           path: python/google_re2-*.whl
@@ -131,22 +135,19 @@ jobs:
       BAZEL_CPU: ${{ matrix.arch.bazel-name }}_windows
       PLAT_NAME: ${{ matrix.arch.python-name }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       # Stash the timestamp for the commit SHA that triggered the workflow.
       - run: echo "timestamp=$(git log -1 --pretty=%ct)" >> "${GITHUB_ENV}"
         shell: bash
-      # Avoid the Chocolatey install of Bazel getting in the way;
-      # `bazelbuild/setup-bazelisk` doesn't work for some reason.
-      - run: |
-          choco uninstall -y bazel
-          choco install -y bazelisk
-        shell: bash
+      - uses: bazel-contrib/setup-bazel@0.8.1
+        with:
+          bazelisk-version: '1.x'
       # Lowercase the architecture name for `actions/setup-python`.
       - run: |
           ARCHITECTURE=${{ matrix.arch.name }}
           echo "architecture=${ARCHITECTURE,,}" >> "${GITHUB_ENV}"
         shell: bash
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: ${{ matrix.ver }}
           architecture: ${{ env.architecture }}
@@ -170,7 +171,7 @@ jobs:
           python re2_test.py
         shell: bash
         working-directory: python
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4.3.1
         with:
           name: ${{ hashFiles('python/google_re2-*.whl') }}
           path: python/google_re2-*.whl
@@ -182,11 +183,11 @@ jobs:
       - wheel-windows
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.1.1
       # Stash the timestamp for the commit SHA that triggered the workflow.
       - run: echo "timestamp=$(git log -1 --pretty=%ct)" >> "${GITHUB_ENV}"
         shell: bash
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v5.0.0
         with:
           python-version: '3.x'
       - name: Prepare Python 3.x environment
@@ -202,7 +203,7 @@ jobs:
           python -m build --sdist
         shell: bash
         working-directory: python
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4.1.4
         with:
           path: python
       - name: Set build number to ${{ inputs.build }}
@@ -218,7 +219,7 @@ jobs:
         shell: bash
         working-directory: python
       - if: inputs.build >= 1
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@v1.8.14
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
           packages-dir: python/dist

.gitignore

@@ -3,3 +3,4 @@
 core
 obj/
 benchlog.*
+user.bazelrc