Skip to content

Commit 4f96de8

Browse files
ericsalocopybara-github
ericsalo
authored and
copybara-github
committed
Internal change.
PiperOrigin-RevId: 841879940
1 parent d170d28 commit 4f96de8

15 files changed

+126
-106
lines changed

‎.github/BUILD.bazel‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@
44
# When updating, also ensure the "xcode_destination" entries in
55
# `.github/workflows/test_objectivec.yml` are supported for the given versions
66
# of Xcode.
7+
xcode_version(
8+
name = "version16_0",
9+
aliases = [
10+
"160",
11+
"16.0",
12+
],
13+
default_ios_sdk_version = "17.2",
14+
default_macos_sdk_version = "14.2",
15+
default_tvos_sdk_version = "17.2",
16+
default_watchos_sdk_version = "10.2",
17+
version = "16.0",
18+
)
19+
720
xcode_version(
821
name = "version15_2_15C500b",
922
aliases = [
@@ -52,3 +65,9 @@ xcode_config(
5265
":version14_1_0_14B47b",
5366
],
5467
)
68+
69+
xcode_config(
70+
name = "host_xcode_16",
71+
default = ":version16_0",
72+
versions = [":version16_0"],
73+
)

‎.github/workflows/staleness_check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ github.event.repository.full_name == 'protocolbuffers/protobuf' }}
2828
steps:
2929
- name: Checkout
30-
uses: protocolbuffers/protobuf-ci/checkout@v5
30+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
3131
with:
3232
ref: ${{ inputs.safe-checkout }}
3333

@@ -50,7 +50,7 @@ jobs:
5050
# In branches where automatic updates work as post-submits, we don't want to run staleness
5151
# tests along with user changes. Any stale files will be automatically fixed in a follow-up
5252
# commit.
53-
uses: protocolbuffers/protobuf-ci/bazel@v5
53+
uses: protocolbuffers/protobuf-ci/bazel@test_bazel_inputs
5454
with:
5555
version: 8.0.1 # Bazel version
5656
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

‎.github/workflows/test_bazel.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- name: Checkout pending changes
3737
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
38-
uses: protocolbuffers/protobuf-ci/checkout@v5
38+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
3939
with:
4040
ref: ${{ inputs.safe-checkout }}
4141

@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Run tests
6666
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
67-
uses: protocolbuffers/protobuf-ci/bazel@v5
67+
uses: protocolbuffers/protobuf-ci/bazel@test_bazel_inputs
6868
with:
6969
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7070
bazel-cache: examples-${{ matrix.bazelversion }}-${{ matrix.bzlmod }}-${{ matrix.toolchain_resolution }}

‎.github/workflows/test_cpp.yml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
steps:
6666
- name: Checkout pending changes
6767
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
68-
uses: protocolbuffers/protobuf-ci/checkout@v5
68+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
6969
with:
7070
ref: ${{ inputs.safe-checkout }}
7171
- name: Run tests
7272
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
73-
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
73+
uses: protocolbuffers/protobuf-ci/bazel-docker@test_bazel_inputs
7474
with:
7575
image: ${{ matrix.image }}
7676
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -92,12 +92,12 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
- name: Checkout pending changes
95-
uses: protocolbuffers/protobuf-ci/checkout@v5
95+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
9696
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
9797
with:
9898
ref: ${{ inputs.safe-checkout }}
9999
- name: Run tests
100-
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
100+
uses: protocolbuffers/protobuf-ci/bazel-docker@test_bazel_inputs
101101
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
102102
with:
103103
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:8.0.1-${{ matrix.version }}-e78301df86b3e4c46ec9ac4d98be00e19305d8f3
@@ -118,26 +118,26 @@ jobs:
118118
steps:
119119
- name: Checkout pending changes
120120
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
121-
uses: protocolbuffers/protobuf-ci/checkout@v5
121+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
122122
with:
123123
ref: ${{ inputs.safe-checkout }}
124124
- name: Cross compile protoc for ${{ matrix.arch }}
125125
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
126126
id: cross-compile
127-
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v5
127+
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@test_bazel_inputs
128128
with:
129129
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 #TODO: b/409557730 - upgrade to bazel 8
130130
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
131131
architecture: linux-${{ matrix.arch }}
132132
- name: Setup sccache
133133
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
134-
uses: protocolbuffers/protobuf-ci/sccache@v5
134+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
135135
with:
136136
cache-prefix: linux-release-${{ matrix.arch }}
137137
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
138138
- name: Run tests
139139
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
140-
uses: protocolbuffers/protobuf-ci/docker@v5
140+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
141141
with:
142142
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:8.0.1-${{ matrix.arch }}-168f9c9d015a0fa16611e1e9eede796fe9bfbb69
143143
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -177,20 +177,20 @@ jobs:
177177
steps:
178178
- name: Checkout pending changes
179179
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
180-
uses: protocolbuffers/protobuf-ci/checkout@v5
180+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
181181
with:
182182
ref: ${{ inputs.safe-checkout }}
183183

184184
- name: Setup sccache
185185
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
186-
uses: protocolbuffers/protobuf-ci/sccache@v5
186+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
187187
with:
188188
cache-prefix: linux-cmake
189189
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
190190

191191
- name: Run tests
192192
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
193-
uses: protocolbuffers/protobuf-ci/docker@v5
193+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
194194
with:
195195
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.16.9-9626718698895971df3953d4aa2321d7425f3c5f
196196
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -219,20 +219,20 @@ jobs:
219219
runs-on: ubuntu-latest
220220
steps:
221221
- name: Checkout pending changes
222-
uses: protocolbuffers/protobuf-ci/checkout@v5
222+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
223223
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
224224
with:
225225
ref: ${{ inputs.safe-checkout }}
226226

227227
- name: Setup sccache
228-
uses: protocolbuffers/protobuf-ci/sccache@v5
228+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
229229
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
230230
with:
231231
cache-prefix: linux-cmake-install
232232
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
233233

234234
- name: Run tests
235-
uses: protocolbuffers/protobuf-ci/docker@v5
235+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
236236
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
237237
with:
238238
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.16.9-9626718698895971df3953d4aa2321d7425f3c5f
@@ -286,7 +286,7 @@ jobs:
286286
runs-on: ubuntu-latest
287287
steps:
288288
- name: Checkout pending changes
289-
uses: protocolbuffers/protobuf-ci/checkout@v5
289+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
290290
with:
291291
ref: ${{ inputs.safe-checkout }}
292292

@@ -318,20 +318,20 @@ jobs:
318318
steps:
319319
- name: Checkout pending changes
320320
if: ${{ inputs.continuous-run }}
321-
uses: protocolbuffers/protobuf-ci/checkout@v5
321+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
322322
with:
323323
ref: ${{ inputs.safe-checkout }}
324324

325325
- name: Setup sccache
326326
if: ${{ inputs.continuous-run }}
327-
uses: protocolbuffers/protobuf-ci/sccache@v5
327+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
328328
with:
329329
cache-prefix: linux-cmake-examples
330330
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
331331

332332
- name: Run tests
333333
if: ${{ inputs.continuous-run }}
334-
uses: protocolbuffers/protobuf-ci/docker@v5
334+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
335335
with:
336336
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake:3.16.9-9626718698895971df3953d4aa2321d7425f3c5f
337337
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -360,20 +360,20 @@ jobs:
360360
steps:
361361
- name: Checkout pending changes
362362
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
363-
uses: protocolbuffers/protobuf-ci/checkout@v5
363+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
364364
with:
365365
ref: ${{ inputs.safe-checkout }}
366366

367367
- name: Setup sccache
368368
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
369-
uses: protocolbuffers/protobuf-ci/sccache@v5
369+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
370370
with:
371371
cache-prefix: linux-cmake-gcc
372372
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
373373

374374
- name: Run tests
375375
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
376-
uses: protocolbuffers/protobuf-ci/docker@v5
376+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
377377
with:
378378
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:8.0.1-12.2-168f9c9d015a0fa16611e1e9eede796fe9bfbb69
379379
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -392,18 +392,18 @@ jobs:
392392
runs-on: ubuntu-latest
393393
steps:
394394
- name: Checkout pending changes
395-
uses: protocolbuffers/protobuf-ci/checkout@v5
395+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
396396
with:
397397
ref: ${{ inputs.safe-checkout }}
398398

399399
- name: Setup sccache
400-
uses: protocolbuffers/protobuf-ci/sccache@v5
400+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
401401
with:
402402
cache-prefix: linux-cmake-32-bit
403403
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
404404

405405
- name: Run tests
406-
uses: protocolbuffers/protobuf-ci/docker@v5
406+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
407407
with:
408408
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:d6028ab408c49932836cdc514116f06886d7f6868a4d430630aa52adc5aee2fc
409409
platform: linux/386
@@ -444,12 +444,12 @@ jobs:
444444
steps:
445445
- name: Checkout pending changes
446446
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
447-
uses: protocolbuffers/protobuf-ci/checkout@v5
447+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
448448
with:
449449
ref: ${{ inputs.safe-checkout }}
450450
- name: Run tests
451451
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
452-
uses: protocolbuffers/protobuf-ci/bazel@v5
452+
uses: protocolbuffers/protobuf-ci/bazel@test_bazel_inputs
453453
with:
454454
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
455455
bazel: ${{ matrix.bazel }}
@@ -504,7 +504,7 @@ jobs:
504504
steps:
505505
- name: Checkout pending changes
506506
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
507-
uses: protocolbuffers/protobuf-ci/checkout@v5
507+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
508508
with:
509509
ref: ${{ inputs.safe-checkout }}
510510

@@ -517,15 +517,15 @@ jobs:
517517

518518
- name: Setup sccache
519519
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
520-
uses: protocolbuffers/protobuf-ci/sccache@v5
520+
uses: protocolbuffers/protobuf-ci/sccache@test_bazel_inputs
521521
with:
522522
cache-prefix: ${{ matrix.cache-prefix }}
523523
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
524524

525525
# Install phase.
526526
- name: Configure CMake for install
527527
if: ${{ matrix.install-flags && (!matrix.continuous-only || inputs.continuous-run) }}
528-
uses: protocolbuffers/protobuf-ci/bash@v5
528+
uses: protocolbuffers/protobuf-ci/bash@test_bazel_inputs
529529
with:
530530
bazel-version: 8.0.1
531531
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -551,7 +551,7 @@ jobs:
551551

552552
- name: Configure CMake
553553
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
554-
uses: protocolbuffers/protobuf-ci/bash@v5
554+
uses: protocolbuffers/protobuf-ci/bash@test_bazel_inputs
555555
with:
556556
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
557557
bazel-version: 8.0.1

‎.github/workflows/test_csharp.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
runs-on: ubuntu-22-4core
2020
steps:
2121
- name: Checkout pending changes
22-
uses: protocolbuffers/protobuf-ci/checkout@v5
22+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
2323
with:
2424
ref: ${{ inputs.safe-checkout }}
2525

2626
# TODO Run this with Bazel once codegen is handled properly.
2727
- name: Run tests
28-
uses: protocolbuffers/protobuf-ci/docker@v5
28+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
2929
with:
3030
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:8.0.1-3.1.415-6.0.100-b77fdae6d4771789dfc66a56bf8d806354e8011a
3131
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -41,7 +41,7 @@ jobs:
4141
run: sudo rm -rf _build .repository-cache
4242

4343
- name: Run conformance tests
44-
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
44+
uses: protocolbuffers/protobuf-ci/bazel-docker@test_bazel_inputs
4545
with:
4646
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:8.0.1-3.1.415-6.0.100-b77fdae6d4771789dfc66a56bf8d806354e8011a
4747
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: windows-2022
5454
steps:
5555
- name: Checkout pending changes
56-
uses: protocolbuffers/protobuf-ci/checkout@v5
56+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
5757
with:
5858
ref: ${{ inputs.safe-checkout }}
5959

@@ -63,7 +63,7 @@ jobs:
6363
dotnet-version: '6.0.x'
6464

6565
- name: Run tests
66-
uses: protocolbuffers/protobuf-ci/bash@v5
66+
uses: protocolbuffers/protobuf-ci/bash@test_bazel_inputs
6767
with:
6868
bazel-version: 8.0.1
6969
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -76,14 +76,14 @@ jobs:
7676
runs-on: ubuntu-latest
7777
steps:
7878
- name: Checkout pending changes
79-
uses: protocolbuffers/protobuf-ci/checkout@v5
79+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
8080
with:
8181
ref: ${{ inputs.safe-checkout }}
8282

8383
- name: Build protobuf C# tests under x86_64 docker image
8484
# Tests are built "dotnet publish" because we want all the dependencies to the copied to the destination directory
8585
# (we want to avoid references to ~/.nuget that won't be available in the subsequent docker run)
86-
uses: protocolbuffers/protobuf-ci/docker@v5
86+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
8787
with:
8888
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim
8989
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
@@ -100,7 +100,7 @@ jobs:
100100
# running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
101101
# otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
102102
# we just run map the user's home to a throwaway temporary directory
103-
uses: protocolbuffers/protobuf-ci/docker@v5
103+
uses: protocolbuffers/protobuf-ci/docker@test_bazel_inputs
104104
with:
105105
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-arm64v8
106106
skip-staleness-check: true

‎.github/workflows/test_hpb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ jobs:
2929
runs-on: ubuntu-22-4core
3030
steps:
3131
- name: Checkout pending changes
32-
uses: protocolbuffers/protobuf-ci/checkout@v5
32+
uses: protocolbuffers/protobuf-ci/checkout@test_bazel_inputs
3333
with:
3434
ref: ${{ inputs.safe-checkout }}
3535
- name: Run tests
36-
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
36+
uses: protocolbuffers/protobuf-ci/bazel-docker@test_bazel_inputs
3737
with:
3838
image: ${{ matrix.image }}
3939
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}

0 commit comments

Comments
 (0)