Skip to content
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.

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

Point all past runs to archive branches #573

Merged
merged 2 commits into from
Jan 6, 2020
Merged

Conversation

encukou
Copy link
Member

@encukou encukou commented Dec 29, 2019

No description provided.

The main change is arca 3.3, which allows slashes in branches.
@encukou encukou mentioned this pull request Dec 29, 2019
@encukou
Copy link
Member Author

encukou commented Dec 29, 2019

The archive branches have the archive/ prefix, so we don't touch them by mistake.
I've set up GitHub branch protection so that only owners/maintainers can push to them.

@hroncok
Copy link
Member

hroncok commented Dec 29, 2019

Do we want this? I mean, people delete branches, apparently, but I was fine having all branches at my own forks.

@encukou
Copy link
Member Author

encukou commented Dec 29, 2019

There was a Slack discussion on this recently.
I think we do want this for most other forks.
I think the branch namespace is a good idea: people tend to make branches for quick PRs under pyvec; it should be clear which ones can be deleted.
As to your fork, will this inconvenience you? If not, might as well do the same thing everywhere -- it might help with automating this later.

See #419 for the 2017/2018 archival.

@hroncok
Copy link
Member

hroncok commented Dec 29, 2019

As to your fork, will this inconvenience you?

Not really, I don't change the past branches at all.

@encukou
Copy link
Member Author

encukou commented Jan 3, 2020

So, is it good to go?

@hroncok
Copy link
Member

hroncok commented Jan 3, 2020

The idea? Yes. But I haven't checked if the branches match the previous content nor whether the change is conplete. Do you want me to?

@encukou
Copy link
Member Author

encukou commented Jan 6, 2020

No, unless you want to :)
I'll check the output and merge if it's similar enough.

@encukou
Copy link
Member Author

encukou commented Jan 6, 2020

The diff was too much for meld at one point, but it looks OK:

  • "Canonical" courses have code highlighting differences due to newer pygments. I'd say they're improvements – e.g. async is a keyword; print is not.
  • 2018/czechitas-ostrava-jaro has the same differences (see Archive the 2018/czechitas-ostrava-jaro run #578)
  • iCal formatting changed somewhat with the new version of ics, but AFAICS the information is the same.
  • Edit URLs changed to the archives, of course

@encukou encukou merged commit 7c6c009 into pyvec:master Jan 6, 2020
@encukou encukou deleted the archivals branch January 6, 2020 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants