@@ -121,8 +121,9 @@ jobs:
121
121
flags : -Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_BUILD_EXAMPLES=ON -DCMAKE_CXX_STANDARD=14
122
122
- name : C++17
123
123
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
126
127
127
128
name : Linux CMake ${{ matrix.name}}
128
129
runs-on : ubuntu-latest
@@ -140,7 +141,7 @@ jobs:
140
141
- name : Run tests
141
142
uses : protocolbuffers/protobuf-ci/docker@v2
142
143
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
144
145
credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
145
146
command : >-
146
147
/test.sh ${{ matrix.flags}} ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -165,7 +166,7 @@ jobs:
165
166
- name : Run tests
166
167
uses : protocolbuffers/protobuf-ci/docker@v2
167
168
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
169
170
credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
170
171
command : >-
171
172
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }} -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_ABSL_PROVIDER=package \&\&
@@ -194,7 +195,7 @@ jobs:
194
195
- name : Run tests
195
196
uses : protocolbuffers/protobuf-ci/docker@v2
196
197
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
198
199
credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
199
200
command : >-
200
201
/install.sh -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }}
@@ -264,7 +265,7 @@ jobs:
264
265
- name : Run tests
265
266
uses : protocolbuffers/protobuf-ci/docker@v2
266
267
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
268
269
credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
269
270
command : >-
270
271
/test.sh ${{ env.CCACHE_CMAKE_FLAGS }}
0 commit comments