Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

sync main with v0.23 into staging #304

Merged
merged 45 commits into from
May 20, 2021
Merged

sync main with v0.23 into staging #304

merged 45 commits into from
May 20, 2021

Conversation

csantanapr
Copy link
Member

/assign @RichieEscarez

RichieEscarez and others added 30 commits November 10, 2020 18:18
@RichieEscarez
disable live reload and fix too many open files error (knative#233)
92679e5
Add an update-codegen to regenerate the static redirects. (knative#239)
ec8357c 
* Add an update-codegen to regenerate the static redirects.

Also fix a bug in redir-gen.

* Add trailing newline

* Fix missing continue
@RichieEscarez
update docs build for 0.19 (knative#240)
b6b84a1
@xtreme-sameer-vohra @RichieEscarez
Update DEVELOPMENT.md (knative#241)
c1ad8bf 
* Update DEVELOPMENT.md

Document dependency on Hugo

* Update DEVELOPMENT.md

Point to docsy's recommended Hugo version.

Co-authored-by: RichieEscarez <[email protected]>

Co-authored-by: RichieEscarez <[email protected]>
@RichieEscarez
Update build scripts to build from any named docs fork (knative#242)
b141e8f 
* make /community optional - default to knative repo

* move webhook payload output to bottom of log

* add logic to determine and use repo name of any fork

* extract and use repo name from specified fork

* Avoid Host key verification failed.
@nak3
Add net-ingressv2 golang redirect (knative#244)
9ec9e48
@RichieEscarez
Fix static HTML build (knative#245)
2851e21 
dont add HUGO server flags unless you enable the server [localbuild.sh -s (true/reload)]
@RichieEscarez
add version 0.20.0 to docs build (knative#247)
a11fd04
@RichieEscarez
normal size nav text (knative#248)
32e8cbb
@slinkydeveloper
Added control protocol redirect (knative#254)
847183c 
Signed-off-by: Francesco Guardiani <[email protected]>
@RichieEscarez
fix typo (knative#249)
56a122a
@csantanapr
add version 0.21.0 to docs build (knative#256)
ee79d8c 
* add version 0.21.0 to docs build

* trigger build

* trigger build back
Redirect contributing URL to the docs website (knative#257)
ab4c12a
Remove README->index renames (knative#259)
b5405bb
@tayarani
Add knative.dev/specs golang redirect (knative#258)
e052141 
* Add knative.dev/specs golang redirect

* squash
@RichieEscarez
search/replace master with main (knative#263)
225c077
@RichieEscarez
Add Google Analytics tracking ID (knative#262)
0dfbc9f 
* new partial for adding 2nd GA id

* force both IDs and ensure feedback buttons work
@rhuss
add: Redirects for various knative-sandbox plugin repos (knative#251)
822bc97
@markusthoemmes
Regenerate redirects to point at main (knative#265)
db466a8
@knative-automation
Run github.com/client9/misspell (knative#266)
9fecf11 
Signed-off-by: Knative Automation <[email protected]>
@RichieEscarez
Fix/update missed release parameter (knative#261)
5c2bbae
@RichieEscarez
Add future Docs release owners as Approvers (knative#264)
f892959
@RichieEscarez
Update development instructions with netlify info (knative#269)
9028c36 
* Copy down notes from Slack

* edits

Co-authored-by: RichieEscarez <[email protected]>
Update to latest version of Hugo from ~6 month old version (knative#270)
33f56ad
Resolved issue where files named "index.md" had incorrect file paths (k…
6ce4827 
…native#272)

relative to local links
Add autogenerated imports (knative#274)
39b2852
@dependabot
Bump y18n from 4.0.0 to 4.0.1 (knative#279)
87ddb1b 
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update OWNERS_ALIASES to match autogen in community (knative#282)
dbe3920
@csantanapr
add instructions for cutting a release (knative#284)
718e640
Fix spaces in command (knative#285)
64260cd
@knative-prow-robot knative-prow-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels May 19, 2021
@google-cla google-cla bot added the cla: yes Indicates the PR's author has signed the CLA. label May 19, 2021
@csantanapr csantanapr mentioned this pull request May 19, 2021
Closed
5 tasks
@RichieEscarez
Copy link
Contributor

@csantanapr something odd is going on? -> it looks like you picked up an outdated OWNERS file (which is why the Bot/linter is blocking this).

When im doing this sync and something funny happens, I try a HARD reset (since the staging branch is a literal copy of whats in main). For example:

git checkout staging
git reset --hard upstream/main
git pull upstream main
git push origin staging

RichieEscarez
RichieEscarez suggested changes May 19, 2021
View reviewed changes
Copy link
Contributor

@RichieEscarez RichieEscarez left a comment

Choose a reason for hiding this comment

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

OWNERS file regression?

@knative-prow-robot knative-prow-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 19, 2021
@csantanapr
Copy link
Member Author

@RichieEscarez
I already tried what you suggested and push
but it looks like there are conflicts because us a reset of the branch, not sure how you handle this in PRs other than replace the branch with the main branch content

@csantanapr
Copy link
Member Author

I know what's going on we have merge a PR to update OWNER_ALIASES in main #300

@knative-prow-robot knative-prow-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 20, 2021
@csantanapr
Copy link
Member Author

@RichieEscarez OK I think I got it fixed now

RichieEscarez
RichieEscarez approved these changes May 20, 2021
View reviewed changes
Copy link
Contributor

@RichieEscarez RichieEscarez left a comment

Choose a reason for hiding this comment

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

/lgtm

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2021
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RichieEscarez

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow-robot knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2021
@knative-prow-robot knative-prow-robot merged commit 820cbd3 into knative:staging May 20, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@RichieEscarez RichieEscarez RichieEscarez approved these changes

Assignees

@RichieEscarez RichieEscarez

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.