Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

fix: merge diregapic with master #577

Merged
merged 16 commits into from
Jun 16, 2021
Merged

Conversation

summer-ji-eng
Copy link
Contributor

No description provided.

haraldreingruber and others added 15 commits May 19, 2021 00:43
* docs: Fixes small typo

* docs: Add missing gce_startup_script end comment

* lint fix

* copyright fix

Co-authored-by: Takashi Matsuo <tmatsuo@google.com>
This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/a89e0ec2-51a7-4b0c-8b07-d5c6dd31a58b/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)

Source-Link: googleapis/synthtool@b891fb4
* feat: add `gcf-owl-bot[bot]` to `ignoreAuthors`

Related: googleapis/repo-automation-bots#1751

* feat: add `yoshi-automation` to `ignoreAuthors`

Source-Author: Daniel Bankhead <danielbankhead@google.com>
Source-Date: Tue May 18 15:08:47 2021 -0700
Source-Repo: googleapis/synthtool
Source-Sha: 7332178a11ddddc91188dc0f25bca1ccadcaa6c6
Source-Link: googleapis/synthtool@7332178
This PR was generated using Autosynth. 🌈

Synth log will be available here:
https://source.cloud.google.com/results/invocations/0ed6cac5-746d-445c-844b-b4b85a0aa18a/targets

- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
* chore: migrate to owl bot

* chore: copy files from googleapis-gen efb563da184f479fabf98da24f969494944d059b

* chore: run the post processor
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
* fix: flaky test

* fix: flaky test

* fix: compute test

* fix: run npm lint

* remove node-fetch

* fix: make test conditional
* fix: Report warning on `.github/workflows/ci.yaml`

Not all files in `.github/workflows` are managed, only `ci.yaml`.

Related false-positive: googleapis/repo-automation-bots#1952 (comment)

* fix: Report warning on `.github/workflows/ci.yaml`

Not all files in `.github/workflows` are managed, only `ci.yaml`.
Source-Link: googleapis/synthtool@2430f8d
Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:14aaee566d6fc07716bb92da416195156e47a4777e7d1cd2bb3e28c46fe30fe2
VERSION is used in @google-cloud/cloud-rad to publish ref docs for
a particular version. Pass VERSION in via Stubby or Fusion.
Source-Link: googleapis/synthtool@740366b
Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:bbdd52de226c00df3356cdf25460397b429ab49552becca645adbc412f6a4ed5
* build: add auto-approve to Node libraries

Co-authored-by: Benjamin E. Coe <bencoe@google.com>
Source-Link: googleapis/synthtool@5cae043
Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:65aa68f2242c172345d7c1e780bced839bfdc344955d6aa460aa63b4481d93e5
Source-Link: googleapis/synthtool@41ccd8c
Post-Processor: gcr.io/repo-automation-bots/owlbot-nodejs:latest@sha256:c9c7828c165b1985579098978877935ee52dda2b1b538087514fd24fa2443e7a
@summer-ji-eng summer-ji-eng requested a review from a team as a code owner June 16, 2021 02:02
@snippet-bot
Copy link

snippet-bot bot commented Jun 16, 2021

No region tags are edited in this PR.

This comment is generated by snippet-bot.
If you find problems with this result, please file an issue at:
https://github.com/googleapis/repo-automation-bots/issues.
To update this comment, add snippet-bot:force-run label or use the checkbox below:

  • Refresh this comment

@product-auto-label product-auto-label bot added the api: compute Issues related to the googleapis/nodejs-compute API. label Jun 16, 2021
@codecov
Copy link

codecov bot commented Jun 16, 2021

Codecov Report

❗ No coverage uploaded for pull request base (diregapic@203a38f). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 7119ace differs from pull request most recent head 996224f. Consider uploading reports for the commit 996224f to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##             diregapic     #577   +/-   ##
============================================
  Coverage             ?   99.61%           
============================================
  Files                ?       22           
  Lines                ?    11948           
  Branches             ?        0           
============================================
  Hits                 ?    11902           
  Misses               ?       46           
  Partials             ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 203a38f...996224f. Read the comment docs.

@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Jun 16, 2021
@summer-ji-eng summer-ji-eng changed the title Merge diregapic with master fix: merge diregapic with master Jun 16, 2021
Copy link
Contributor

@JustinBeckwith JustinBeckwith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little confused about what's happening here. It doesn't look like there are any changes. It also looks like you're pulling from merge_diregapic_master into diregapic, which is a little confusing based on the title. What's this trying to do?

@summer-ji-eng
Copy link
Contributor Author

I'm a little confused about what's happening here. It doesn't look like there are any changes. It also looks like you're pulling from merge_diregapic_master into diregapic, which is a little confusing based on the title. What's this trying to do?

Sorry for the confusion. #537 has conflict with master branch. My intention here is to create a PR on top of diregapic and merge with master. Since diregapic is seperated from master, in this PR, I keep the changes in diregapic and drop the master change.

@alexander-fenster alexander-fenster merged commit a4e3884 into diregapic Jun 16, 2021
@alexander-fenster alexander-fenster deleted the merge_diregapic_master branch June 16, 2021 17:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
api: compute Issues related to the googleapis/nodejs-compute API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants