Skip to content

Add callable action to repopulate the recipe archives #1038

New issue

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

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

Already on GitHub? # to your account

Merged
merged 4 commits into from
Dec 17, 2021
Merged

Add callable action to repopulate the recipe archives #1038

merged 4 commits into from
Dec 17, 2021

Conversation

weaverryan
Copy link
Member

Q A
License MIT
Doc issue/PR None

Relates to: symfony-tools/recipes-checker#3

On push to main - which is rare - we would run the new command to completely repopulate the archived directory on the flex/main branch. This really only needs to be done once, because it's kept up to date after automatically. But we could choose to run it on push just in case.

There IS one problem: how to replicate this for recipes-contrib?

@nicolas-grekas
Copy link
Member

@nicolas-grekas
Copy link
Member

nicolas-grekas commented Dec 17, 2021

This would mean calling that workflow callable-* and referencing it from recipe-contrib's master branch

@weaverryan
Copy link
Member Author

GREAT idea. WDYT about this attempt? I can't test, so I'm shooting a bit blindly here :)

@nicolas-grekas nicolas-grekas changed the title On "main" push, repopulate the recipe archives Add callable action to repopulate the recipe archives Dec 17, 2021
@nicolas-grekas nicolas-grekas merged commit 93265b3 into symfony:main Dec 17, 2021
@weaverryan weaverryan deleted the adding-action-update-archived branch December 17, 2021 17:39
fabpot added a commit to symfony/flex that referenced this pull request Jan 19, 2022
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Merge-powered recipe update system

Hi!

tl;dr; Updating recipes was a pain. Now its easy: the new `recipes:update` command performs a smart "patch" to your project of what actually changed in the recipe.

[![asciicast](https://asciinema.org/a/456707.svg)](https://asciinema.org/a/456707)

If you run simply `composer recipes:update`, then it will ask you what to update, from a list of only the out-dated recipes (thanks to @shadowc for the idea!):

<img width="696" alt="Screen Shot 2021-12-17 at 11 18 09 AM" src="https://user-images.githubusercontent.com/121003/146575617-8ca7c6c8-1897-4fb4-be33-cdd5bf6894c0.png">

As you can see, if there are conflicts, you fix them like normal git conflicts. In addition to the unit tests, I've tried this on a fairly out-dated project and it worked *brilliantly*. This was NOT possible until @nicolas-grekas open sourced the Flex server - so a HUGE thanks 🎆

### How It Works

A) Whenever `symfony/recipes` (or contrib) has a new commit, a GitHub action *already* stores each recipe as JSON, which becomes the "recipe API": https://github.com/symfony/recipes/tree/flex/main. A change to that action (symfony/recipes#1037) and the recipes-checker (symfony-tools/recipes-checker#2) will add an "archived/" directory that contains EVERY version of every recipe. You can see an example in my fork: https://github.com/weaverryan/recipes/tree/flex/main/archived

B) When you run `recipes:update <package/name>`, we fetch the "original" recipe and "new" recipe and then pass both to each "configurator". Its job is to say what files would exist and what they would look if the "original" recipe were installed now and if the "new" recipe were installed now.

C) We use these "original files" and "new files" to generate a patch file.

D) We apply that patch file to the user's actual project. There are a few tricks here, like temporarily inserting the git "blob" for what the "original" version of the file would look like. That allows for a 3-way merge.

So, while it was a bit of work, it's a fairly straightforward process. It makes keeping your recipes up to date both easy and rewarding.

## TODOS

* [x] Merge recipes-checker PR symfony-tools/recipes-checker#2
* [x] Merge symfony/recipes PR symfony/recipes#1037
* [x] Update `Downloader` in this PR to remove 2x TODOs that the above PR's will enable
* [x] Make sure the `archived/` directory is populated for both `recipes` and `recipes-contrib` - see symfony-tools/recipes-checker#3 and symfony/recipes#1038
* [x] Document that this now exists symfony/symfony-docs#16301

Cheers!

Commits
-------

3ee7719 Merge-powered recipe update system
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants