Skip to content

Commit a27b3e6

Browse files
deannagarciadeannagarcia
committed
Merge with main to fix unrelated tests.
2 parents c46f0e4 + b0d4b2c commit a27b3e6

59 files changed

Lines changed: 433 additions & 293 deletions

Some content is hidden

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

‎.github/workflows/janitor.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,47 @@ jobs:
2828
echo "Closing #$pr..."
2929
gh pr close --comment "Auto-closing Copybara pull request" --delete-branch "$pr"
3030
done
31+
32+
stale-others:
33+
name: Close stale non-copybara PRs and issues
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/stale@b69b346013879cedbf50c69f572cd85439a41936
37+
with:
38+
stale-issue-message: >
39+
We triage inactive PRs and issues in order to make it easier to find
40+
active work. If this issue should remain active or becomes active
41+
again, please add a comment.
42+
43+
44+
This issue is labeled `inactive` because the last activity was over
45+
90 days ago.
46+
close-pr-message: >
47+
We triage inactive PRs and issues in order to make it easier to find
48+
active work. If this issue should remain active or becomes active
49+
again, please reopen it.
50+
51+
52+
This issue was closed and archived because there has been no new
53+
activity in the 14 days since the `inactive` label was added.
54+
stale-pr-message: >
55+
We triage inactive PRs and issues in order to make it easier to find
56+
active work. If this PR should remain active, please add a comment.
57+
58+
59+
This PR is labeled `inactive` because the last activity was over 90
60+
days ago. This PR will be closed and archived after 14 additional
61+
days without activity.
62+
close-pr-message: >
63+
We triage inactive PRs and issues in order to make it easier to find
64+
active work. If this PR should remain active or becomes active
65+
again, please reopen it.
66+
67+
68+
This PR was closed and archived because there has been no new
69+
activity in the 14 days since the `inactive` label was added.
70+
stale-issue-label: 'inactive'
71+
stale-pr-label: 'inactive'
72+
days-before-stale: 90
73+
days-before-close: 14
74+
operations-per-run: 100

‎.github/workflows/staleness_check.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
5555
bazel-cache: staleness
5656
bash: >
57+
set -ex;
5758
if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then
5859
bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS ||
5960
echo "Please run ./regenerate_stale_files.sh to regenerate stale files";

‎.github/workflows/staleness_refresh.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
# failing then you may need to generate a fresh token.
3131
token: ${{ secrets.BOT_ACCESS_TOKEN }}
3232
- name: Configure name and email address in Git
33-
run: git config user.name "Protobuf Team Bot" && git config user.email "[email protected]"
33+
run: cd ${{ github.workspace }} && git config user.name "Protobuf Team Bot" && git config user.email "[email protected]"
3434
- name: Commit and push update
35-
uses: protocolbuffers/protobuf-ci/bazel@v2
36-
with:
37-
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
38-
bazel-cache: staleness
39-
bash: ci/push_auto_update.sh
35+
run: cd ${{ github.workspace }} && ./ci/push_auto_update.sh

‎.github/workflows/test_upb.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
with:
101101
cache: pip
102102
cache-dependency-path: 'python/requirements.txt'
103+
python-version: '3.11' # 3.12 doesn't have setuptools
103104
- name: Run tests
104105
uses: protocolbuffers/protobuf-ci/bazel@v2
105106
with:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
7979
endif ()
8080

8181
# Version metadata
82-
set(protobuf_VERSION_STRING "4.24.0")
82+
set(protobuf_VERSION_STRING "4.25.0")
8383
set(protobuf_DESCRIPTION "Protocol Buffers")
8484
set(protobuf_CONTACT "[email protected]")
8585

‎Protobuf-C++.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Protobuf-C++'
3-
s.version = '4.24.0'
3+
s.version = '4.25.0'
44
s.summary = 'Protocol Buffers v3 runtime library for C++.'
55
s.homepage = 'https://github.com/google/protobuf'
66
s.license = 'BSD-3-Clause'

‎Protobuf.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# dependent projects use the :git notation to refer to the library.
66
Pod::Spec.new do |s|
77
s.name = 'Protobuf'
8-
s.version = '3.24.0'
8+
s.version = '3.25.0'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/protocolbuffers/protobuf'
1111
s.license = 'BSD-3-Clause'

‎WORKSPACE‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
workspace(name = "com_google_protobuf")
22

3+
# An explicit self-reference to work around changes in Bazel 7.0
4+
# See https://github.com/bazelbuild/bazel/issues/19973#issuecomment-1787814450
5+
# buildifier: disable=duplicated-name
6+
local_repository(name = "com_google_protobuf", path = ".")
7+
38
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
49

510
local_repository(

‎csharp/Google.Protobuf.Tools.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Google Protocol Buffers tools</title>
66
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
77
<description>See project site for more info.</description>
8-
<version>3.24.0</version>
8+
<version>3.25.0</version>
99
<authors>Google Inc.</authors>
1010
<owners>protobuf-packages</owners>
1111
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

‎csharp/src/Google.Protobuf/Google.Protobuf.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
66
<Copyright>Copyright 2015, Google Inc.</Copyright>
77
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
8-
<VersionPrefix>3.24.0</VersionPrefix>
8+
<VersionPrefix>3.25.0</VersionPrefix>
99
<LangVersion>10.0</LangVersion>
1010
<Authors>Google Inc.</Authors>
1111
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

0 commit comments

Comments
 (0)