Skip to content

Commit cfb1c87

Browse files
committed
chore: Fix CI issue
1 parent 4c7ad0d commit cfb1c87

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

.github/workflows/downstream.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ jobs:
6363
sudo apt-get update
6464
sudo apt-get -y install libxml2-utils
6565
- name: Perform downstream compatibility testing
66-
run: ./.kokoro/presubmit/downstream-compatibility-spring.sh
66+
run: ./.kokoro/presubmit/downstream-compatibility-spring.sh

.github/workflows/downstream_protobuf_source_compatibility_check_nightly.yaml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
on:
2-
push:
3-
branches:
4-
- main
52
workflow_dispatch:
63
inputs:
74
protobuf_versions:
8-
description: 'Comma separated list of Protobuf-Java versions (i.e. 3.25.5, 4.28.3)'
5+
description: 'Comma separated list of Protobuf-Java versions (i.e. "3.25.5","4.28.3")'
6+
# Default value for workflow_dispatch flow. If updating default value, update below as well.
97
default: '"3.25.5","4.28.3"'
10-
required: false
11-
pull_request:
8+
required: true
129
schedule:
1310
- cron: '0 1 * * *' # Nightly at 1am
1411

@@ -35,9 +32,8 @@ jobs:
3532
- java-storage
3633
- java-storage-nio
3734
# Specify the Protobuf versions here as well because the default values above are only supplied from
38-
# workflow_dispatch flow. The nightly workflow doesn't have a default input otherwise. The default
39-
# values above provide an example of the expected format in the UI. When updating, update both sections
40-
# to provide a proper default.
35+
# the workflow_dispatch flow. Without this, the nightly workflow doesn't have a default input otherwise
36+
# and would resolve to ''. When updating, update both places to keep default values consistent.
4137
protobuf-version: ${{ fromJSON(format('[{0}]', inputs.protobuf_versions || '"3.25.5","4.28.3"')) }}
4238
steps:
4339
- uses: actions/checkout@v3
@@ -46,9 +42,5 @@ jobs:
4642
java-version: 17
4743
distribution: temurin
4844
- run: mvn -version
49-
- name: Install xmllint
50-
run: |
51-
sudo apt-get update
52-
sudo apt-get -y install libxml2-utils
5345
- name: Perform downstream compatibility testing
5446
run: REPOS_UNDER_TEST="${{ matrix.repo }}" PROTOBUF_RUNTIME_VERSION="${{ matrix.protobuf-version}}" ./.kokoro/presubmit/downstream-protobuf-source-compatibility.sh

.kokoro/presubmit/downstream-protobuf-source-compatibility.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ if [ -z "${PROTOBUF_RUNTIME_VERSION}" ]; then
2727
exit 1
2828
fi
2929

30-
# Get the directory of the build script
31-
scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
3230
cd "${scriptDir}/../.." # cd to the root of this repo
33-
source "$scriptDir/common.sh"
3431

3532
setup_maven_mirror
3633

0 commit comments

Comments
 (0)