Skip to content

Commit 1eee151

Browse files
bufdevbufdev
authored
Merge branch 'main' into third-party-buf
2 parents 751c8d3 + b6548fc commit 1eee151

422 files changed

Lines changed: 18034 additions & 9889 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
58+
uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
5959
with:
6060
sarif_file: results.sarif

‎.github/workflows/staleness_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# commit.
5353
uses: protocolbuffers/protobuf-ci/bazel@v5
5454
with:
55-
version: 8.0.1 # Bazel version
55+
version: 9.0.0 # Bazel version
5656
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5757
bazel-cache: staleness
5858
bash: >

‎.github/workflows/test_bazel.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ on:
1414
type: string
1515
continuous-prefix:
1616
required: true
17-
description: "The string continuous-only tests should be prefixed with when displaying test
18-
results."
17+
description: "The string continuous-only tests should be prefixed with when displaying test results."
1918
type: string
2019

2120
permissions:

‎.github/workflows/test_cpp.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ jobs:
510510

511511
- name: Setup MSVC
512512
if: ${{ runner.os == 'Windows' && (!matrix.continuous-only || inputs.continuous-run) }}
513-
uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
513+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
514514
with:
515515
arch: ${{ matrix.windows-arch || 'x64' }}
516516
vsversion: ${{ matrix.vsversion }}

‎.github/workflows/test_csharp.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@ jobs:
2727
- name: Run tests
2828
uses: protocolbuffers/protobuf-ci/docker@v5
2929
with:
30-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:8.0.1-3.1.415-6.0.100-b77fdae6d4771789dfc66a56bf8d806354e8011a
30+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:9.0.0-3.1.415-8.0.100-05b57cb3d33f45f689c1dace146b6b9619d78872
3131
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
3232
entrypoint: /bin/bash
3333
command: >-
3434
-cex "
3535
cd csharp &&
3636
dotnet restore src/Google.Protobuf.sln &&
3737
dotnet build -c Release src/Google.Protobuf.sln &&
38-
dotnet test -c Release -f net6.0 src/Google.Protobuf.Test/Google.Protobuf.Test.csproj"
38+
dotnet test -c Release -f net8.0 src/Google.Protobuf.Test/Google.Protobuf.Test.csproj"
3939
4040
- name: Clear bazel between docker instances
4141
run: sudo rm -rf _build .repository-cache
4242

4343
- name: Run conformance tests
4444
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
4545
with:
46-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:8.0.1-3.1.415-6.0.100-b77fdae6d4771789dfc66a56bf8d806354e8011a
46+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:9.0.0-3.1.415-8.0.100-05b57cb3d33f45f689c1dace146b6b9619d78872
4747
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
4848
bazel-cache: csharp_linux
49-
bazel: test //csharp:conformance_test --action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=/home/bazel
49+
bazel: test //csharp:conformance_test --action_env=PATH --action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 --test_env=DOTNET_CLI_HOME=/home/bazel
5050

5151
windows:
5252
name: Windows
@@ -60,12 +60,12 @@ jobs:
6060
- name: Setup dotnet
6161
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
6262
with:
63-
dotnet-version: '6.0.x'
63+
dotnet-version: '8.0.x'
6464

6565
- name: Run tests
6666
uses: protocolbuffers/protobuf-ci/bash@v5
6767
with:
68-
bazel-version: 8.0.1
68+
bazel-version: 9.0.0
6969
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7070
command: |
7171
dotnet build csharp/src/Google.Protobuf.sln
@@ -85,13 +85,13 @@ jobs:
8585
# (we want to avoid references to ~/.nuget that won't be available in the subsequent docker run)
8686
uses: protocolbuffers/protobuf-ci/docker@v5
8787
with:
88-
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim
88+
image: mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim
8989
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
9090
command: >-
9191
/bin/bash -cex '
9292
DOTNET_CLI_TELEMETRY_OPTOUT=true
9393
DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
94-
dotnet publish -c Release -f net6.0 /workspace/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj'
94+
dotnet publish -c Release -f net8.0 /workspace/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj'
9595
9696
- name: Use an actual aarch64 docker image to run protobuf C# tests with an emulator
9797
# "dotnet vstest" allows running tests from a pre-built project.
@@ -102,11 +102,11 @@ jobs:
102102
# we just run map the user's home to a throwaway temporary directory
103103
uses: protocolbuffers/protobuf-ci/docker@v5
104104
with:
105-
image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-arm64v8
105+
image: mcr.microsoft.com/dotnet/sdk:8.0.100-bookworm-slim-arm64v8
106106
skip-staleness-check: true
107107
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
108108
command: >-
109109
/bin/bash -cex '
110110
DOTNET_CLI_TELEMETRY_OPTOUT=true
111111
DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
112-
dotnet vstest /workspace/csharp/src/Google.Protobuf.Test/bin/Release/net6.0/publish/Google.Protobuf.Test.dll'
112+
dotnet vstest /workspace/csharp/src/Google.Protobuf.Test/bin/Release/net8.0/publish/Google.Protobuf.Test.dll'

‎.github/workflows/test_hpb.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
include:
2424
- targets: "//hpb/... //hpb_generator/..."
25-
- image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3"
25+
- image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:9.0.0-7932bf8b25fb76a111e7257d151a6a58d5c3c671"
2626
- bazel_cmd: "test"
2727

2828
name: Linux ${{ matrix.config.name }}

‎.github/workflows/test_objectivec.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
CODE_SIGN_IDENTITY: "-"
7171
with:
7272
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
73-
bazel-version: 8.0.1
73+
bazel-version: 9.0.0
7474
command: |
7575
xcodebuild \
7676
-project "objectivec/${{ matrix.xc_project }}" \
@@ -113,7 +113,7 @@ jobs:
113113
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
114114
uses: protocolbuffers/protobuf-ci/bazel@v5
115115
with:
116-
version: 8.0.1 # Bazel version
116+
version: 9.0.0 # Bazel version
117117
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
118118
bazel-cache: cocoapods/${{ matrix.XCODE }}
119119
bash: |
@@ -161,7 +161,7 @@ jobs:
161161
if: ${{ !matrix.config.continuous-only || inputs.continuous-run }}
162162
uses: protocolbuffers/protobuf-ci/bazel@v5
163163
with:
164-
version: 8.0.1 # Bazel version
164+
version: 9.0.0 # Bazel version
165165
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
166166
bazel: ${{ matrix.config.bazel_action }} ${{ matrix.config.flags }} ${{ matrix.bazel_targets }}
167167
bazel-cache: objc_${{ matrix.platform }}_${{ matrix.config.name }}

‎.github/workflows/test_php.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
6666
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
6767
with:
68-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.1-${{ matrix.version }}-7d856878bb9d57cf17083cbf1078afe50f3013f3
68+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/php:9.0.0-${{ matrix.version }}-9fc33a0c378b5affd3c85d3f5ae4f330993048f7
6969
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
7070
bazel-cache: php_linux/${{ matrix.version }}
7171
bash: |
@@ -115,7 +115,7 @@ jobs:
115115
id: cross-compile
116116
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v5
117117
with:
118-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3
118+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:9.0.0-7932bf8b25fb76a111e7257d151a6a58d5c3c671
119119
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
120120
architecture: linux-i386
121121

@@ -147,7 +147,7 @@ jobs:
147147
id: cross-compile
148148
uses: protocolbuffers/protobuf-ci/cross-compile-protoc@v5
149149
with:
150-
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3
150+
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:9.0.0-7932bf8b25fb76a111e7257d151a6a58d5c3c671
151151
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
152152
architecture: linux-aarch64
153153

@@ -188,7 +188,7 @@ jobs:
188188

189189
- name: Pin PHP version
190190
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
191-
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
191+
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # 2.36.0
192192
with:
193193
php-version: ${{ matrix.version }}
194194

@@ -204,7 +204,7 @@ jobs:
204204
uses: protocolbuffers/protobuf-ci/bash@v5
205205
with:
206206
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
207-
bazel-version: 8.0.1
207+
bazel-version: 9.0.0
208208
# TODO this shouldn't be necessary, remove it
209209
bazel-flags: --xcode_version_config=//.github:host_xcodes_macos15
210210
command: |
@@ -220,6 +220,6 @@ jobs:
220220
uses: protocolbuffers/protobuf-ci/bazel@v5
221221
with:
222222
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
223-
version: 8.0.1 # Bazel version
223+
version: 9.0.0 # Bazel version
224224
bazel-cache: php_macos15/${{ matrix.version }}
225225
bazel: test //php:conformance_test //php:conformance_test_c --action_env=PATH --test_env=PATH --xcode_version_config=//.github:host_xcodes_macos15

‎.github/workflows/test_php_ext.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Package extension
3636
uses: protocolbuffers/protobuf-ci/bazel@v5
3737
with:
38-
version: 8.0.1 # Bazel version
38+
version: 9.0.0 # Bazel version
3939
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
4040
bazel-cache: php_ext/${{ matrix.version }}
4141
bash: >

‎.github/workflows/test_python.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
6565
uses: protocolbuffers/protobuf-ci/bazel-docker@v5
6666
with:
67-
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:8.0.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }}
67+
image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:9.0.0-{0}-7932bf8b25fb76a111e7257d151a6a58d5c3c671', matrix.version) }}
6868
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
6969
bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }}
7070
bazel: test ${{ matrix.targets }} ${{ matrix.flags }} ${{ matrix.nobzlmod && '--noenable_bzlmod' || '' }} --test_env=KOKORO_PYTHON_VERSION
@@ -115,7 +115,7 @@ jobs:
115115
env:
116116
KOKORO_PYTHON_VERSION: ${{ matrix.version }}
117117
with:
118-
version: 8.0.1 # Bazel version
118+
version: 9.0.0 # Bazel version
119119
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
120120
bazel-cache: python_macos/${{ matrix.type }}_${{ matrix.version }}
121121
bazel: >-

0 commit comments

Comments
 (0)