Skip to content

Commit c49d967

Browse files
meltsufinmeltsufin
authored
chore: fix typo in update_owlbot_postprocessor_config.sh (googleapis#8535)
Fixes: googleapis#8533.
1 parent b285c74 commit c49d967

168 files changed

Lines changed: 150 additions & 2383 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/generated_files_sync.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,13 @@ jobs:
7474
bash generation/generate_coverage_aggregator.sh
7575
- name: Fail if there's any difference
7676
run: git --no-pager diff --exit-code
77-
77+
owlbot-py:
78+
name: applying templated owlbot.py config doesn't create a diff
79+
runs-on: ubuntu-latest
80+
steps:
81+
- uses: actions/checkout@v3
82+
- name: Generate google-cloud-gapic-bom/pom.xml
83+
run: |
84+
bash generation/update_owlbot_postprocessor_config.sh
85+
- name: Fail if there's any difference
86+
run: git --no-pager diff --exit-code

‎generation/bootstrap.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ git commit -am 'chore: create google-cloud-gapic-bom'
9090

9191
cp ../../gapic_bom_versions.txt google-cloud-gapic-bom/versions.txt
9292

93-
# Generate Release Please configuration files
94-
bash ../../generate_release_please_config.sh
95-
96-
git add --all
97-
git commit -am 'chore: create release please configuration'
98-
9993
../../generate_coverage_aggregator.sh
10094

10195
git add --all
@@ -111,6 +105,12 @@ git commit -am 'chore: delete non-auto-generated samples'
111105
git add --all
112106
git commit -am 'chore: update versions to latest in maven'
113107

108+
# Generate Release Please configuration files
109+
bash ../../generate_release_please_config.sh
110+
111+
git add --all
112+
git commit -am 'chore: create release please configuration'
113+
114114
../../update_owlbot_postprocessor_config.sh
115115

116116
git add --all

‎generation/update_owlbot_postprocessor_config.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ for dir in $(find . -mindepth 2 -maxdepth 2 -name owlbot.py | sort | xargs dirna
1212
# form a perl command to replace java.common_templates() invocation
1313
perl_command='s/java\.common_templates\(.*\)/java.common_templates(excludes=['
1414
comma=""
15-
for exclusion in '.github/*' '.kokoro/*' '.samples/*' 'CODE_OF_CONDUCT.md' 'CONTRIBUTING.md' 'LICENSE' 'SECURITY.md' 'java.header' 'license-checks.xml' 'renovate.json'; do
15+
for exclusion in '.github/*' '.kokoro/*' 'samples/*' 'CODE_OF_CONDUCT.md' 'CONTRIBUTING.md' 'LICENSE' 'SECURITY.md' 'java.header' 'license-checks.xml' 'renovate.json'; do
1616
perl_command+="${comma}\n $(echo "\"${exclusion}\"" | sed 's/\//\\\//g')"
1717
comma=","
1818

1919
# delete files and directories
20-
if [[ ${exclusion: -2} == '/*' ]]; then
20+
if [[ ${exclusion: -2} == '/*' && ${exclusion%??} != 'samples' ]]; then
2121
rm -rf "${exclusion%??}" || true
2222
else
2323
rm "${exclusion}" || true

‎generation/update_versions.sh‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,4 @@ for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirnam
117117
done
118118
done
119119

120-
echo "These artifacts don't exist: ${missing_artifacts[*]}"
121-
122-
echo "Generating the release-please configurations..."
123-
./generation/generate_release_please_config.sh
124-
echo "Done generating release-please configurations..."
125-
126-
echo "Copying over the README and CHANGELOG files"
127-
./generation/copy_readme_changelog.sh
128-
echo "Done copying over the README and CHANGELOG files"
120+
echo "These artifacts don't exist: ${missing_artifacts[*]}"

‎java-accessapproval/owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
java.common_templates(excludes=[
2525
".github/*",
2626
".kokoro/*",
27-
".samples/*",
27+
"samples/*",
2828
"CODE_OF_CONDUCT.md",
2929
"CONTRIBUTING.md",
3030
"LICENSE",

‎java-accesscontextmanager/owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
java.common_templates(excludes=[
2525
".github/*",
2626
".kokoro/*",
27-
".samples/*",
27+
"samples/*",
2828
"CODE_OF_CONDUCT.md",
2929
"CONTRIBUTING.md",
3030
"LICENSE",

‎java-aiplatform/owlbot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
java.common_templates(excludes=[
2525
".github/*",
2626
".kokoro/*",
27-
".samples/*",
27+
"samples/*",
2828
"CODE_OF_CONDUCT.md",
2929
"CONTRIBUTING.md",
3030
"LICENSE",

‎java-aiplatform/samples/install-without-bom/pom.xml‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎java-aiplatform/samples/pom.xml‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎java-aiplatform/samples/snapshot/pom.xml‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

0 commit comments

Comments
 (0)