Skip to content

Commit

Permalink
Merge branch 'main' into feat/unmanaged-dependency-check
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeWang1127 committed Nov 28, 2023
2 parents b97b883 + 6c4c236 commit 7c4ae40
Show file tree
Hide file tree
Showing 299 changed files with 13,983 additions and 1,919 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
# Java 8 tests uses JDK 11 to compile and JDK 8 to run tests.
# Java 8 tests uses JDK 17 to compile and JDK 8 to run tests.
- uses: actions/setup-java@v3
with:
java-version: 8
Expand All @@ -69,7 +69,7 @@ jobs:
shell: bash
run: |
set -x
export JAVA_HOME=$JAVA11_HOME
export JAVA_HOME=$JAVA_HOME
export PATH=${JAVA_HOME}/bin:$PATH
# Maven surefire plugin lets us to specify the JVM when running tests via
# the "jvm" system property.
Expand Down Expand Up @@ -153,15 +153,6 @@ jobs:
# testlib modules of gax
run: mvn package clirr:check -DskipTests

requirements-kokoro:
runs-on: ubuntu-latest
container: gcr.io/cloud-devrel-public-resources/java11
steps:
- uses: actions/checkout@v3
- run: python3 --version
- run: python3 -m pip install --require-hashes -r .kokoro/requirements.txt
- run: python3 -m releasetool publish-reporter-script > /dev/null

showcase:
runs-on: ubuntu-22.04
strategy:
Expand Down Expand Up @@ -282,7 +273,7 @@ jobs:
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
- name: Validate gapic-generator-java-bom
uses: googleapis/java-cloud-bom/tests/validate-bom@d06156f6b8580b2b59923dee68ea81b69b98a6f9
uses: googleapis/java-cloud-bom/tests/validate-bom@ab98a491b510503e8ff461c42ecd3cc4e67a44cb
with:
bom-path: gapic-generator-java-bom/pom.xml

27 changes: 26 additions & 1 deletion .github/workflows/verify_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
matrix:
java: [ 8 ]
os: [ ubuntu-22.04, macos-12 ]
post_processing: [ 'true', 'false' ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -22,11 +23,35 @@ jobs:
java-version: ${{ matrix.java }}
distribution: temurin
cache: maven
- uses: actions/setup-python@v4
with:
python-version: '3.11'
- name: install docker (ubuntu)
if: matrix.os == 'ubuntu-22.04'
run: |
set -x
# install docker
sudo apt install containerd -y
sudo apt install -y docker.io docker-compose
# launch docker
sudo systemctl start docker
- name: install docker (macos)
if: matrix.os == 'macos-12'
run: |
brew update --preinstall
brew install docker docker-compose qemu
brew upgrade qemu
colima start
docker run --user $(id -u):$(id -g) --rm hello-world
- name: Run integration tests
run: |
set -x
git config --global user.email "[email protected]"
git config --global user.name "Github Workflow"
library_generation/test/generate_library_integration_test.sh \
--googleapis_gen_url https://cloud-java-bot:${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}@github.com/googleapis/googleapis-gen.git
--googleapis_gen_url https://cloud-java-bot:${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}@github.com/googleapis/googleapis-gen.git \
--enable_postprocessing "${{ matrix.post_processing }}"
unit_tests:
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-17-downstream.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
}
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-downstream.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2"
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
}
49 changes: 0 additions & 49 deletions .kokoro/release/common.cfg

This file was deleted.

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

This file was deleted.

30 changes: 0 additions & 30 deletions .kokoro/release/publish_javadoc11.cfg

This file was deleted.

144 changes: 0 additions & 144 deletions .kokoro/release/publish_javadoc11.sh

This file was deleted.

Loading

0 comments on commit 7c4ae40

Please sign in to comment.