-
Notifications
You must be signed in to change notification settings - Fork 101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ci: configure the protected branch #2549
Open
burkedavison
wants to merge
1
commit into
6.43.x
Choose a base branch
from
release-brancher/ci/6.43.x
base: 6.43.x
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,113 @@ | ||
| # Copyright 2022 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # Github action job to test core java library features on | ||
| # downstream client libraries before they are released. | ||
| on: | ||
| 'on': | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| - 6.43.x | ||
| pull_request: null | ||
| name: ci | ||
| jobs: | ||
| units: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: [11, 17] | ||
| java: | ||
| - 11 | ||
| - 17 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| units-java8: | ||
| # Building using Java 17 and run the tests with Java 8 runtime | ||
| name: "units (8)" | ||
| name: units (8) | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: zulu | ||
| - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV | ||
| shell: bash | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 17 | ||
| distribution: zulu | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: temurin | ||
| - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV | ||
| shell: bash | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 17 | ||
| distribution: temurin | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: test | ||
| windows: | ||
| runs-on: windows-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: zulu | ||
| - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV | ||
| shell: bash | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 11 | ||
| distribution: zulu | ||
| - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV | ||
| shell: bash | ||
| - run: java -version | ||
| - run: .kokoro/build.bat | ||
| env: | ||
| JOB_TYPE: test | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: temurin | ||
| - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV | ||
| shell: bash | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 11 | ||
| distribution: temurin | ||
| - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV | ||
| shell: bash | ||
| - run: java -version | ||
| - run: .kokoro/build.bat | ||
| env: | ||
| JOB_TYPE: test | ||
| dependencies: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| java: [17] | ||
| java: | ||
| - 17 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: zulu | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/dependencies.sh | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: ${{matrix.java}} | ||
| - run: java -version | ||
| - run: .kokoro/dependencies.sh | ||
| javadoc: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: javadoc | ||
| lint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: zulu | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: lint | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: lint | ||
| clirr: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: zulu | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: clirr | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - run: java -version | ||
| - run: .kokoro/build.sh | ||
| env: | ||
| JOB_TYPE: clirr |
59 changes: 28 additions & 31 deletions
59
.github/workflows/integration-tests-against-emulator.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,39 @@ | ||
| on: | ||
| 'on': | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
| - 6.43.x | ||
| pull_request: null | ||
| name: integration-tests-against-emulator | ||
| jobs: | ||
| units: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| services: | ||
| emulator: | ||
| image: gcr.io/cloud-spanner-emulator/emulator:latest | ||
| ports: | ||
| - 9010:9010 | ||
| - 9020:9020 | ||
|
|
||
| - '9010:9010' | ||
| - '9020:9020' | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: stCarolas/setup-maven@v4 | ||
| with: | ||
| maven-version: 3.8.1 | ||
| # Build with JDK 11 and run tests with JDK 8 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 11 | ||
| distribution: zulu | ||
| - name: Compiling main library | ||
| run: .kokoro/build.sh | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: zulu | ||
| - name: Running tests | ||
| run: | | ||
| mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \ | ||
| -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \ | ||
| -Dmaven.main.skip=true -fae verify | ||
| env: | ||
| JOB_TYPE: test | ||
| SPANNER_EMULATOR_HOST: localhost:9010 | ||
| GOOGLE_CLOUD_PROJECT: emulator-test-project | ||
| - uses: actions/checkout@v2 | ||
| - uses: stCarolas/setup-maven@v4 | ||
| with: | ||
| maven-version: 3.8.1 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 11 | ||
| distribution: temurin | ||
| - name: Compiling main library | ||
| run: .kokoro/build.sh | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| java-version: 8 | ||
| distribution: temurin | ||
| - name: Running tests | ||
| run: | | ||
| mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \ | ||
| -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \ | ||
| -Dmaven.main.skip=true -fae verify | ||
| env: | ||
| JOB_TYPE: test | ||
| SPANNER_EMULATOR_HOST: localhost:9010 | ||
| GOOGLE_CLOUD_PROJECT: emulator-test-project | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we modifying this? We would want the code pushed to
mainbranch to be tested against emulator.