Skip to content

Commit 2447882

Browse files
mkruskal-googlecopybara-github
authored andcommitted
Update Abseil dependency in cmake docker images
PiperOrigin-RevId: 564754603
1 parent e4aeff3 commit 2447882

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

.github/workflows/staleness_check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
branch: [main, 22.x, 23.x, 24.x]
2222
os: [{ name: Linux, value: ubuntu-latest}]
2323

24-
name: Test staleness ${{ matrix.os.name }} ${{ inputs.safe-checkout && 'PR' || matrix.branch }}
24+
name: Test staleness ${{ matrix.os.name }} ${{ github.head_ref && 'PR' || matrix.branch }}
2525
runs-on: ${{ matrix.os.value }}
2626
if: ${{ github.event.repository.full_name == 'protocolbuffers/protobuf' }}
2727
steps:
28-
- name: Checkout ${{ inputs.safe-checkout && 'PR' || matrix.branch }}
28+
- name: Checkout ${{ github.head_ref && 'PR' || matrix.branch }}
2929
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
3030
with:
31-
ref: ${{ inputs.safe-checkout || matrix.branch }}
31+
ref: ${{ github.head_ref || matrix.branch }}
3232

3333
- name: Mark runs associated with commits
3434
if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' }}

.github/workflows/test_cpp.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,9 @@ jobs:
121121
flags: -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=14
122122
- name: C++17
123123
flags: -DCMAKE_CXX_STANDARD=17
124-
- name: C++20
125-
flags: -DCMAKE_CXX_STANDARD=20
124+
# TODO(b/300096720) Re-enable this.
125+
#- name: C++20
126+
# flags: -DCMAKE_CXX_STANDARD=20
126127

127128
name: Linux CMake ${{ matrix.name}}
128129
runs-on: ubuntu-latest
@@ -140,7 +141,7 @@ jobs:
140141
- name: Run tests
141142
uses: protocolbuffers/protobuf-ci/docker@v2
142143
with:
143-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e6272cdfe97c6df307e17b83f3a7a70844f6fc08
144+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e508da4f6a96f1baeca8aafa4d835c48295691b3
144145
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
145146
command: >-
146147
/test.sh ${{ matrix.flags}} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -165,7 +166,7 @@ jobs:
165166
- name: Run tests
166167
uses: protocolbuffers/protobuf-ci/docker@v2
167168
with:
168-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
169+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e508da4f6a96f1baeca8aafa4d835c48295691b3
169170
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
170171
command: >-
171172
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }} -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package \&\&
@@ -194,7 +195,7 @@ jobs:
194195
- name: Run tests
195196
uses: protocolbuffers/protobuf-ci/docker@v2
196197
with:
197-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.10.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
198+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e508da4f6a96f1baeca8aafa4d835c48295691b3
198199
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
199200
command: >-
200201
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -264,7 +265,7 @@ jobs:
264265
- name: Run tests
265266
uses: protocolbuffers/protobuf-ci/docker@v2
266267
with:
267-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-1da1e086a7d1863b8bdd181ef6388a02dcd62f3a
268+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.13.3-e508da4f6a96f1baeca8aafa4d835c48295691b3
268269
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
269270
command: >-
270271
/test.sh ${{ env.CCACHE_CMAKE_FLAGS }}

rust/defs.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ load(
1414
visibility([
1515
"//experimental/...",
1616
"//src/google/protobuf/...",
17+
"//rust/...",
1718
])
1819

1920
def rust_proto_library(name, deps, visibility = [], **args):

0 commit comments

Comments
 (0)