Skip to content

Commit

Permalink
Merge branch 'main' into renovate/org.hamcrest-hamcrest-core-2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
alicejli committed May 2, 2024
2 parents 382d2c9 + e3caf05 commit 8c093a8
Show file tree
Hide file tree
Showing 33 changed files with 156 additions and 1,097 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
digest: sha256:a6aa751984f1e905c3ae5a3aac78fc7b68210626ce91487dc7ff4f0a06f010cc
# created: 2024-01-22T14:14:20.913785597Z
digest: sha256:084ad4c60551b075846bcb2405ec1c14b0d00ec1eb5503d4dd0d2a92cdc2d3e2
# created: 2024-03-15T14:33:32.257974519Z
4 changes: 4 additions & 0 deletions .github/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@ branches:
handleGHRelease: true
releaseType: java-backport
branch: 1.19.x
- bumpMinorPreMajor: true
handleGHRelease: true
releaseType: java-backport
branch: 1.20.x
12 changes: 12 additions & 0 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@ branchProtectionRules:
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
- pattern: 1.20.x
isAdminEnforced: true
requiredStatusCheckContexts:
- dependencies (17)
- lint
- clirr
- units (8)
- units (11)
- cla/google
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
permissionRules:
- team: Googlers
permission: pull
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: SonarCloud
on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 17
distribution: temurin
- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze for full test coverage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: |
mvn -B verify -Dcheckstyle.skip \
-DenableFullTestCoverage \
-Dsonar.coverage.jacoco.xmlReportPaths=oauth2_http/target/site/jacoco/jacoco.xml \
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Pcoverage \
-Dsonar.projectKey=googleapis_google-auth-library-java \
-Dsonar.organization=googleapis \
-Dsonar.host.url=https://sonarcloud.io
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.1"
value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.7.6"
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.1"
value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.7.6"
}

env_vars: {
Expand Down
53 changes: 0 additions & 53 deletions .kokoro/release/bump_snapshot.cfg

This file was deleted.

30 changes: 0 additions & 30 deletions .kokoro/release/bump_snapshot.sh

This file was deleted.

49 changes: 0 additions & 49 deletions .kokoro/release/common.cfg

This file was deleted.

50 changes: 0 additions & 50 deletions .kokoro/release/common.sh

This file was deleted.

6 changes: 0 additions & 6 deletions .kokoro/release/drop.cfg

This file was deleted.

32 changes: 0 additions & 32 deletions .kokoro/release/drop.sh

This file was deleted.

6 changes: 0 additions & 6 deletions .kokoro/release/promote.cfg

This file was deleted.

34 changes: 0 additions & 34 deletions .kokoro/release/promote.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .kokoro/release/publish_javadoc.cfg

This file was deleted.

Loading

0 comments on commit 8c093a8

Please sign in to comment.