Skip to content

chore: fix typo in update_owlbot_postprocessor_config.sh #8535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 5 commits into from
Oct 6, 2022
Merged

chore: fix typo in update_owlbot_postprocessor_config.sh #8535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13a7073
chore: fix typo in update_owlbot_postprocessor_config.sh
meltsufin Oct 5, 2022
6537d5b
chore: fix bootstrap.sh by removing extra invocations in update_versi…
meltsufin Oct 6, 2022
c26bb1e
chore: add a check for OwlBot Postprocessor config
meltsufin Oct 6, 2022
5c63adf
Merge branch 'main' into fix-owlbot-exclusions
meltsufin Oct 6, 2022
b8af7c8
chore: empty commit
meltsufin Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/generated_files_sync.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,13 @@ jobs:
bash generation/generate_coverage_aggregator.sh
- name: Fail if there's any difference
run: git --no-pager diff --exit-code

owlbot-py:
name: applying templated owlbot.py config doesn't create a diff
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Generate google-cloud-gapic-bom/pom.xml
run: |
bash generation/update_owlbot_postprocessor_config.sh
- name: Fail if there's any difference
run: git --no-pager diff --exit-code
12 changes: 6 additions & 6 deletions generation/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ git commit -am 'chore: create google-cloud-gapic-bom'

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

# Generate Release Please configuration files
bash ../../generate_release_please_config.sh

git add --all
git commit -am 'chore: create release please configuration'

../../generate_coverage_aggregator.sh

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

# Generate Release Please configuration files
bash ../../generate_release_please_config.sh

git add --all
git commit -am 'chore: create release please configuration'

../../update_owlbot_postprocessor_config.sh

git add --all
Expand Down
4 changes: 2 additions & 2 deletions generation/update_owlbot_postprocessor_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ for dir in $(find . -mindepth 2 -maxdepth 2 -name owlbot.py | sort | xargs dirna
# form a perl command to replace java.common_templates() invocation
perl_command='s/java\.common_templates\(.*\)/java.common_templates(excludes=['
comma=""
for exclusion in '.github/*' '.kokoro/*' '.samples/*' 'CODE_OF_CONDUCT.md' 'CONTRIBUTING.md' 'LICENSE' 'SECURITY.md' 'java.header' 'license-checks.xml' 'renovate.json'; do
for exclusion in '.github/*' '.kokoro/*' 'samples/*' 'CODE_OF_CONDUCT.md' 'CONTRIBUTING.md' 'LICENSE' 'SECURITY.md' 'java.header' 'license-checks.xml' 'renovate.json'; do
perl_command+="${comma}\n $(echo "\"${exclusion}\"" | sed 's/\//\\\//g')"
comma=","

# delete files and directories
if [[ ${exclusion: -2} == '/*' ]]; then
if [[ ${exclusion: -2} == '/*' && ${exclusion%??} != 'samples' ]]; then
rm -rf "${exclusion%??}" || true
else
rm "${exclusion}" || true
Expand Down
10 changes: 1 addition & 9 deletions generation/update_versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,4 @@ for path in $(find . -mindepth 2 -maxdepth 2 -name pom.xml | sort | xargs dirnam
done
done

echo "These artifacts don't exist: ${missing_artifacts[*]}"

echo "Generating the release-please configurations..."
./generation/generate_release_please_config.sh
echo "Done generating release-please configurations..."

echo "Copying over the README and CHANGELOG files"
./generation/copy_readme_changelog.sh
echo "Done copying over the README and CHANGELOG files"
echo "These artifacts don't exist: ${missing_artifacts[*]}"
2 changes: 1 addition & 1 deletion java-accessapproval/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion java-accesscontextmanager/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion java-aiplatform/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
84 changes: 0 additions & 84 deletions java-aiplatform/samples/install-without-bom/pom.xml
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions java-aiplatform/samples/pom.xml
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions java-aiplatform/samples/snapshot/pom.xml
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions java-aiplatform/samples/snippets/pom.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion java-analytics-admin/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion java-analytics-data/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
2 changes: 1 addition & 1 deletion java-api-gateway/owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
java.common_templates(excludes=[
".github/*",
".kokoro/*",
".samples/*",
"samples/*",
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
Expand Down
Loading