Skip to content

Commit f36e717

Browse files
authored
chore: fix conversion to owlbot (googleapis#463)
Remove synth.py since this repo now use owlbot
1 parent 7a22a1b commit f36e717

File tree

4 files changed

+36
-100
lines changed

4 files changed

+36
-100
lines changed

java-resourcemanager/.github/.OwlBot.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ docker:
1818
deep-remove-regex:
1919
- "/grpc-google-.*/src"
2020
- "/proto-google-.*/src"
21-
- "/google-.*/src/main/java/com/google/cloud/resourcemanager/(v.*)"
21+
- "/google-.*/src"
2222

2323
deep-copy-regex:
2424
- source: "/google/cloud/resourcemanager/(v.*)/.*-java/proto-google-.*/src"
25-
dest: "/proto-google-cloud-resourcemanager-$1/src"
25+
dest: "/owl-bot-staging/$1/proto-google-cloud-resourcemanager-$1/src"
2626
- source: "/google/cloud/resourcemanager/(v.*)/.*-java/grpc-google-.*/src"
27-
dest: "/grpc-google-cloud-resourcemanager-$1/src"
28-
- source: "/google/cloud/resourcemanager/v.*/.*-java/gapic-google-.*/src"
29-
dest: "/google-cloud-resourcemanager/src"
27+
dest: "/owl-bot-staging/$1/grpc-google-cloud-resourcemanager-$1/src"
28+
- source: "/google/cloud/resourcemanager/(v.*)/.*-java/gapic-google-.*/src"
29+
dest: "/owl-bot-staging/$1/google-cloud-resourcemanager/src"

java-resourcemanager/.github/sync-repo-settings.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@ branchProtectionRules:
2929
requiresStrictStatusChecks: false
3030
# List of required status check contexts that must pass for commits to be accepted to matching branches.
3131
requiredStatusCheckContexts:
32-
- "dependencies (8)"
33-
- "dependencies (11)"
34-
- "linkage-monitor"
35-
- "lint"
36-
- "clirr"
37-
- "units (7)"
38-
- "units (8)"
39-
- "units (11)"
40-
- "Kokoro - Test: Integration"
41-
- "cla/google"
32+
- "dependencies (8)"
33+
- "dependencies (11)"
34+
- "linkage-monitor"
35+
- "lint"
36+
- "clirr"
37+
- "units (7)"
38+
- "units (8)"
39+
- "units (11)"
40+
- "Kokoro - Test: Integration"
41+
- "cla/google"
4242
# List of explicit permissions to add (additive only)
4343
permissionRules:
4444
- team: yoshi-admins
4545
permission: admin
4646
- team: yoshi-java-admins
4747
permission: admin
4848
- team: yoshi-java
49-
permission: push
49+
permission: push
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
# Copyright 2019 Google LLC
1+
# Copyright 2021 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
55
# You may obtain a copy of the License at
66
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
7+
# https://www.apache.org/licenses/LICENSE-2.0
88
#
99
# Unless required by applicable law or agreed to in writing, software
1010
# distributed under the License is distributed on an "AS IS" BASIS,
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
"""This script is used to synthesize generated parts of this library."""
15+
import synthtool as s
16+
from synthtool.languages import java
1617

17-
import synthtool.languages.java as java
1818

19-
AUTOSYNTH_MULTIPLE_COMMITS = True
19+
for library in s.get_staging_dirs():
20+
# put any special-case replacements here
21+
s.move(library)
2022

21-
java.common_templates()
23+
s.remove_staging_dirs()
24+
java.common_templates()

java-resourcemanager/synth.metadata

Lines changed: 11 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -3,91 +3,24 @@
33
{
44
"git": {
55
"name": ".",
6-
"remote": "https://github.com/googleapis/java-resourcemanager.git",
7-
"sha": "b3f53537ab83aed1afb065d49553649893e7f89e"
6+
"remote": "git@github.com:googleapis/java-resourcemanager.git",
7+
"sha": "3fd447e9149529a915fd982630056e74b0ad6216"
8+
}
9+
},
10+
{
11+
"git": {
12+
"name": "googleapis-gen",
13+
"remote": "https://github.com/googleapis/googleapis-gen.git",
14+
"sha": "32337a2c2ec4d35de81519661e279ada7e3bfcf2",
15+
"internalRef": "369574301"
816
}
917
},
1018
{
1119
"git": {
1220
"name": "synthtool",
1321
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
22+
"sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f"
1523
}
1624
}
17-
],
18-
"generatedFiles": [
19-
".github/CODEOWNERS",
20-
".github/ISSUE_TEMPLATE/bug_report.md",
21-
".github/ISSUE_TEMPLATE/feature_request.md",
22-
".github/ISSUE_TEMPLATE/support_request.md",
23-
".github/PULL_REQUEST_TEMPLATE.md",
24-
".github/blunderbuss.yml",
25-
".github/generated-files-bot.yml",
26-
".github/readme/synth.py",
27-
".github/release-please.yml",
28-
".github/snippet-bot.yml",
29-
".github/trusted-contribution.yml",
30-
".github/workflows/approve-readme.yaml",
31-
".github/workflows/auto-release.yaml",
32-
".github/workflows/ci.yaml",
33-
".github/workflows/samples.yaml",
34-
".kokoro/build.bat",
35-
".kokoro/build.sh",
36-
".kokoro/coerce_logs.sh",
37-
".kokoro/common.cfg",
38-
".kokoro/common.sh",
39-
".kokoro/continuous/common.cfg",
40-
".kokoro/continuous/java8.cfg",
41-
".kokoro/continuous/readme.cfg",
42-
".kokoro/dependencies.sh",
43-
".kokoro/nightly/common.cfg",
44-
".kokoro/nightly/integration.cfg",
45-
".kokoro/nightly/java11.cfg",
46-
".kokoro/nightly/java7.cfg",
47-
".kokoro/nightly/java8-osx.cfg",
48-
".kokoro/nightly/java8-win.cfg",
49-
".kokoro/nightly/java8.cfg",
50-
".kokoro/nightly/samples.cfg",
51-
".kokoro/populate-secrets.sh",
52-
".kokoro/presubmit/clirr.cfg",
53-
".kokoro/presubmit/common.cfg",
54-
".kokoro/presubmit/dependencies.cfg",
55-
".kokoro/presubmit/integration.cfg",
56-
".kokoro/presubmit/java11.cfg",
57-
".kokoro/presubmit/java7.cfg",
58-
".kokoro/presubmit/java8-osx.cfg",
59-
".kokoro/presubmit/java8-win.cfg",
60-
".kokoro/presubmit/java8.cfg",
61-
".kokoro/presubmit/linkage-monitor.cfg",
62-
".kokoro/presubmit/lint.cfg",
63-
".kokoro/presubmit/samples.cfg",
64-
".kokoro/readme.sh",
65-
".kokoro/release/bump_snapshot.cfg",
66-
".kokoro/release/common.cfg",
67-
".kokoro/release/common.sh",
68-
".kokoro/release/drop.cfg",
69-
".kokoro/release/drop.sh",
70-
".kokoro/release/promote.cfg",
71-
".kokoro/release/promote.sh",
72-
".kokoro/release/publish_javadoc.cfg",
73-
".kokoro/release/publish_javadoc.sh",
74-
".kokoro/release/publish_javadoc11.cfg",
75-
".kokoro/release/publish_javadoc11.sh",
76-
".kokoro/release/snapshot.cfg",
77-
".kokoro/release/snapshot.sh",
78-
".kokoro/release/stage.cfg",
79-
".kokoro/release/stage.sh",
80-
".kokoro/trampoline.sh",
81-
"CODE_OF_CONDUCT.md",
82-
"CONTRIBUTING.md",
83-
"LICENSE",
84-
"codecov.yaml",
85-
"java.header",
86-
"license-checks.xml",
87-
"renovate.json",
88-
"samples/install-without-bom/pom.xml",
89-
"samples/pom.xml",
90-
"samples/snapshot/pom.xml",
91-
"samples/snippets/pom.xml"
9225
]
9326
}

0 commit comments

Comments
 (0)