Skip to content

Commit f0c0488

Browse files
chore: update common templates (#1449)
* chore: remove java 7 units check Source-Author: Neenu Shaji <[email protected]> Source-Date: Wed Jul 28 18:18:26 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 1a2878d6909dd10ca4e3c1b5943d6622e996054e Source-Link: googleapis/synthtool@1a2878d * build(java): use ENABLE_FLAKYBOT env variable Kokoro job config now supports both environment variables during this migration period. Source-Author: Jeff Ching <[email protected]> Source-Date: Thu Aug 12 10:10:27 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: ff01716e16d2c6e87eaf87197b753ac9fcbbed5d Source-Link: googleapis/synthtool@ff01716 * chore: enable release-trigger bot Source-Author: Jeff Ching <[email protected]> Source-Date: Tue Aug 24 15:30:40 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 63cff634aabb85854caa511c5837ea6b45f42b4b Source-Link: googleapis/synthtool@63cff63 * ci: removing linkage-monitor from the required checks Source-Author: Tomo Suzuki <[email protected]> Source-Date: Wed Aug 25 13:18:10 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22 Source-Link: googleapis/synthtool@e2aa5bc * build(java): update renovate config to mark conformance tests as a test commit type Source-Author: kolea2 <[email protected]> Source-Date: Tue Aug 31 14:35:19 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 9a238a0623879c3de129a376c6085d4a862f6eb9 Source-Link: googleapis/synthtool@9a238a0 * chore(java): install maven 3.8.1 at runtime * chore: pin github action runner at ubuntu-16.04 * chore: install maven 3.8.1 at runtime * chore: fix typo Source-Author: Neenu Shaji <[email protected]> Source-Date: Thu Sep 2 15:46:06 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: ad7fd76e17bf9494a3e47ff9cf445f61564432e0 Source-Link: googleapis/synthtool@ad7fd76 * chore(java): update windows build to install maven 3.8.1 at runtime too (related to #1202) Tested in [java-bigquerystorage](googleapis/java-bigquerystorage@7834f4f) Source-Author: Stephanie Wang <[email protected]> Source-Date: Tue Sep 7 13:04:27 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925 Source-Link: googleapis/synthtool@17ee6e5 Co-authored-by: Neenu Shaji <[email protected]>
1 parent cc63e41 commit f0c0488

File tree

7 files changed

+24
-19
lines changed

7 files changed

+24
-19
lines changed

.github/release-trigger.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
enabled: true

.github/workflows/ci.yaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 8, 11]
12+
java: [8, 11]
1313
steps:
1414
- uses: actions/checkout@v2
15+
- uses: stCarolas/setup-maven@v4
16+
with:
17+
maven-version: 3.8.1
1518
- uses: actions/setup-java@v1
1619
with:
1720
java-version: ${{matrix.java}}
@@ -23,6 +26,9 @@ jobs:
2326
runs-on: windows-latest
2427
steps:
2528
- uses: actions/checkout@v2
29+
- uses: stCarolas/setup-maven@v4
30+
with:
31+
maven-version: 3.8.1
2632
- uses: actions/setup-java@v1
2733
with:
2834
java-version: 8
@@ -37,28 +43,21 @@ jobs:
3743
java: [8, 11]
3844
steps:
3945
- uses: actions/checkout@v2
46+
- uses: stCarolas/setup-maven@v4
47+
with:
48+
maven-version: 3.8.1
4049
- uses: actions/setup-java@v1
4150
with:
4251
java-version: ${{matrix.java}}
4352
- run: java -version
4453
- run: .kokoro/dependencies.sh
45-
linkage-monitor:
46-
runs-on: ubuntu-latest
47-
steps:
48-
- uses: actions/checkout@v2
49-
- uses: actions/setup-java@v1
50-
with:
51-
java-version: 8
52-
- run: java -version
53-
- name: Install artifacts to local Maven repository
54-
run: .kokoro/build.sh
55-
shell: bash
56-
- name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release)
57-
uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
5854
lint:
5955
runs-on: ubuntu-latest
6056
steps:
6157
- uses: actions/checkout@v2
58+
- uses: stCarolas/setup-maven@v4
59+
with:
60+
maven-version: 3.8.1
6261
- uses: actions/setup-java@v1
6362
with:
6463
java-version: 8
@@ -70,6 +69,9 @@ jobs:
7069
runs-on: ubuntu-latest
7170
steps:
7271
- uses: actions/checkout@v2
72+
- uses: stCarolas/setup-maven@v4
73+
with:
74+
maven-version: 3.8.1
7375
- uses: actions/setup-java@v1
7476
with:
7577
java-version: 8

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fi
115115
# fix output location of logs
116116
bash .kokoro/coerce_logs.sh
117117

118-
if [[ "${ENABLE_BUILD_COP}" == "true" ]]
118+
if [[ "${ENABLE_FLAKYBOT}" == "true" ]]
119119
then
120120
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
121121
${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/google-http-java-client

.kokoro/nightly/integration.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env_vars: {
2222
}
2323

2424
env_vars: {
25-
key: "ENABLE_BUILD_COP"
25+
key: "ENABLE_FLAKYBOT"
2626
value: "true"
2727
}
2828

.kokoro/nightly/samples.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ env_vars: {
3333
}
3434

3535
env_vars: {
36-
key: "ENABLE_BUILD_COP"
36+
key: "ENABLE_FLAKYBOT"
3737
value: "true"
3838
}

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
"^junit:junit",
5151
"^com.google.truth:truth",
5252
"^org.mockito:mockito-core",
53-
"^org.objenesis:objenesis"
53+
"^org.objenesis:objenesis",
54+
"^com.google.cloud:google-cloud-conformance-tests"
5455
],
5556
"semanticCommitType": "test",
5657
"semanticCommitScope": "deps"

synth.metadata

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9"
14+
"sha": "17ee6e5c08f2eb47029beee4776ce990e56b3925"
1515
}
1616
}
1717
],
@@ -25,6 +25,7 @@
2525
".github/generated-files-bot.yml",
2626
".github/readme/synth.py",
2727
".github/release-please.yml",
28+
".github/release-trigger.yml",
2829
".github/snippet-bot.yml",
2930
".github/sync-repo-settings.yaml",
3031
".github/trusted-contribution.yml",

0 commit comments

Comments
 (0)