diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml index cdb1ea185..f216e9581 100644 --- a/.github/release-trigger.yml +++ b/.github/release-trigger.yml @@ -1,2 +1,2 @@ enabled: true -multiScmName: nodejs-spanner +multiScmName: nodejs-spanner \ No newline at end of file diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index b5ae23b24..9e91ffc8a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -7,7 +7,6 @@ branchProtectionRules: requiredStatusCheckContexts: - "ci/kokoro: Samples test" - "ci/kokoro: System test" - - "ci/kokoro: System test with Regular Sessions" - lint - test (18) - test (20) @@ -15,11 +14,6 @@ branchProtectionRules: - cla/google - windows - OwlBot Post Processor - - Build with Airlock permissionRules: - - team: yoshi-admins - permission: admin - - team: jsteam-admins - permission: admin - - team: jsteam + - team: cloud-sdk-nodejs-team permission: push diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh index a05dabce1..528775394 100755 --- a/.kokoro/samples-test.sh +++ b/.kokoro/samples-test.sh @@ -51,12 +51,6 @@ if [ -f samples/package.json ]; then $KOKORO_GFILE_DIR/linux_amd64/flakybot } trap cleanup EXIT HUP - else - # Check if there are any changes in the "samples" directory only for presubmits. - if git diff --quiet HEAD main -- samples/; then - echo "No changes detected in the samples directory. Skipping sample tests." - exit 0 - fi fi npm run samples-test diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh index b2fd6d24d..5d6cfcca5 100755 --- a/.kokoro/trampoline_v2.sh +++ b/.kokoro/trampoline_v2.sh @@ -165,9 +165,6 @@ if [[ -n "${KOKORO_BUILD_ID:-}" ]]; then # For flakybot "KOKORO_GITHUB_COMMIT_URL" "KOKORO_GITHUB_PULL_REQUEST_URL" - "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS" - "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS" - "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW" ) elif [[ "${TRAVIS:-}" == "true" ]]; then RUNNING_IN_CI="true" diff --git a/README.md b/README.md index 2f55e5c9a..4094b69d0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**_THIS REPOSITORY IS DEPRECATED. ALL OF ITS CONTENT AND HISTORY HAS BEEN MOVED TO [GOOGLE-CLOUD-NODE](https://github.com/googleapis/google-cloud-node/tree/main/packages/handwritten)_** + [//]: # "This README.md file is auto-generated, all changes to this file will be lost." [//]: # "To regenerate it, use `python -m synthtool`." Google Cloud Platform logo diff --git a/owlbot.py b/owlbot.py index 1628cd2fa..49fce7a64 100644 --- a/owlbot.py +++ b/owlbot.py @@ -1,6 +1,6 @@ -# Copyright 2021 Google LLC +# Copyright 2022 Google LLC # -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensed under the Apache License, Version 2.0 (the License); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # @@ -11,62 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -import synthtool as s -import synthtool.gcp as gcp import synthtool.languages.node as node -import logging -from pathlib import Path -from synthtool import _tracked_paths -from synthtool import shell -import shutil - -staging = Path("owl-bot-staging") - -if staging.is_dir(): - logging.info(f"Copying files from staging directory ${staging}.") - - # nodejs-spanner is composed of 3 APIs: SpannerClient, SpannerAdminDatabase and - # SpannerAdminInstance, all 3 are exported in src/v1/index.js - # Excluding auto-generated system test since Spanner has its own packing test - excludes=["src/index.ts", "src/v1/index.ts", "README.md", "package.json", - "system-test/*", "system-test/fixtures/sample/*", "system-test/fixtures/sample/src/*", - "tsconfig.json"] - - # Copy spanner library. - for version in ['v1']: - library = staging / version - _tracked_paths.add(library) - s.copy([library], excludes=excludes) - - excludes += ["webpack.config.js", ".jsdoc.js"] - - # Copy the admin/database library. - for version in ['v1']: - library = staging / 'admin' / 'database' / version - _tracked_paths.add(library) - s.copy([library], excludes=excludes) - - # Copy the admin/instance library. - for version in ['v1']: - library = staging / 'admin' / 'instance' / version - _tracked_paths.add(library) - s.copy([library], excludes=excludes) - - # Copy the spanner/executor library. - for version in ['v1']: - library = staging / 'executor' / version - _tracked_paths.add(library) - s.copy([library], excludes=excludes) - - # The staging directory should never be merged into the main branch. - shutil.rmtree(staging) - -common_templates = gcp.CommonTemplates() -templates = common_templates.node_library(source_location='build/src') -s.copy(templates, excludes=[".kokoro/samples-test.sh", ".kokoro/trampoline_v2.sh", ".github/release-trigger.yml", ".github/sync-repo-settings.yaml"]) - -node.postprocess_gapic_library_hermetic() - -# Remove generated samples from veneer library: -shell.run(('rm', '-rf', 'samples/generated'), hide_output = False) +node.owlbot_main(templates_excludes=[ +'README.md' +])