diff options
author | Cronet Mainline Eng <cronet-mainline-eng+copybara@google.com> | 2024-06-07 18:59:21 +0900 |
---|---|---|
committer | Motomu Utsumi <motomuman@google.com> | 2024-06-07 19:00:37 +0900 |
commit | 93dc77d4cfa4a2996ac5bf4c67b0d4223847eb65 (patch) | |
tree | 92c5aba3655194ff55d27c652a265bd6f87b0470 /third_party/re2/src/.github | |
parent | b66ce594f84a102bf71c3e2754d9c0bfdd620b85 (diff) | |
download | cronet-93dc77d4cfa4a2996ac5bf4c67b0d4223847eb65.tar.gz |
Import Cronet version 124.0.6367.42
FolderOrigin-RevId: /tmp/copybara-origin/src
Change-Id: I727d2277512236d7d0db42e102d291b6204b38e5
Diffstat (limited to 'third_party/re2/src/.github')
-rwxr-xr-x | third_party/re2/src/.github/bazel.sh | 37 | ||||
-rwxr-xr-x | third_party/re2/src/.github/cmake.sh | 13 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/ci-bazel.yml | 4 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/ci-cmake.yml | 6 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/ci.yml | 8 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/pages.yml | 10 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/pr.yml | 4 | ||||
-rw-r--r-- | third_party/re2/src/.github/workflows/python.yml | 30 |
8 files changed, 56 insertions, 56 deletions
diff --git a/third_party/re2/src/.github/bazel.sh b/third_party/re2/src/.github/bazel.sh index 7295ec6a8..1fe309fab 100755 --- a/third_party/re2/src/.github/bazel.sh +++ b/third_party/re2/src/.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 diff --git a/third_party/re2/src/.github/cmake.sh b/third_party/re2/src/.github/cmake.sh index 782334e81..5e42d3703 100755 --- a/third_party/re2/src/.github/cmake.sh +++ b/third_party/re2/src/.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 diff --git a/third_party/re2/src/.github/workflows/ci-bazel.yml b/third_party/re2/src/.github/workflows/ci-bazel.yml index a12a7c580..4eea110fb 100644 --- a/third_party/re2/src/.github/workflows/ci-bazel.yml +++ b/third_party/re2/src/.github/workflows/ci-bazel.yml @@ -14,8 +14,8 @@ jobs: env: BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v4 - - uses: p0deje/setup-bazel@0.6.0 + - uses: actions/checkout@v4.1.1 + - uses: bazel-contrib/setup-bazel@0.8.1 with: bazelisk-version: '1.x' - run: .github/bazel.sh diff --git a/third_party/re2/src/.github/workflows/ci-cmake.yml b/third_party/re2/src/.github/workflows/ci-cmake.yml index a49fd53b1..6e131fe1a 100644 --- a/third_party/re2/src/.github/workflows/ci-cmake.yml +++ b/third_party/re2/src/.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 diff --git a/third_party/re2/src/.github/workflows/ci.yml b/third_party/re2/src/.github/workflows/ci.yml index 445da78d6..27ce6ece7 100644 --- a/third_party/re2/src/.github/workflows/ci.yml +++ b/third_party/re2/src/.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 diff --git a/third_party/re2/src/.github/workflows/pages.yml b/third_party/re2/src/.github/workflows/pages.yml index 0f0a57a15..5bff8306c 100644 --- a/third_party/re2/src/.github/workflows/pages.yml +++ b/third_party/re2/src/.github/workflows/pages.yml @@ -17,13 +17,13 @@ jobs: # Bazel fails if the username is unknown. USER: runner steps: - - uses: actions/checkout@v4 - - uses: p0deje/setup-bazel@0.6.0 + - 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: @@ -37,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 diff --git a/third_party/re2/src/.github/workflows/pr.yml b/third_party/re2/src/.github/workflows/pr.yml index 267dd5d7d..805f0fa4a 100644 --- a/third_party/re2/src/.github/workflows/pr.yml +++ b/third_party/re2/src/.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'); diff --git a/third_party/re2/src/.github/workflows/python.yml b/third_party/re2/src/.github/workflows/python.yml index 892922e48..7d9048c09 100644 --- a/third_party/re2/src/.github/workflows/python.yml +++ b/third_party/re2/src/.github/workflows/python.yml @@ -31,11 +31,11 @@ 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: p0deje/setup-bazel@0.6.0 + - uses: bazel-contrib/setup-bazel@0.8.1 with: bazelisk-version: '1.x' - name: Prepare Python ${{ matrix.ver }} environment @@ -58,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 @@ -84,14 +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: p0deje/setup-bazel@0.6.0 + - uses: bazel-contrib/setup-bazel@0.8.1 with: bazelisk-version: '1.x' - - uses: actions/setup-python@v5 + - uses: actions/setup-python@v5.0.0 with: python-version: ${{ matrix.ver }} - name: Prepare Python ${{ matrix.ver }} environment @@ -115,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 @@ -135,11 +135,11 @@ 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 - - uses: p0deje/setup-bazel@0.6.0 + - uses: bazel-contrib/setup-bazel@0.8.1 with: bazelisk-version: '1.x' # Lowercase the architecture name for `actions/setup-python`. @@ -147,7 +147,7 @@ jobs: 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 }} @@ -171,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 @@ -183,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 @@ -203,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 }} @@ -219,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 |