Skip to content

Fix dependency conflicts#1550

Merged
ssbarnea merged 1 commit intocookiecutter:stable/1.7.xfrom
ssbarnea:stable/1.7.x
May 14, 2021
Merged

Fix dependency conflicts#1550
ssbarnea merged 1 commit intocookiecutter:stable/1.7.xfrom
ssbarnea:stable/1.7.x

Conversation

@ssbarnea
Copy link
Copy Markdown
Member

This backports changes already made to master via: #1549 and #1548

@ssbarnea ssbarnea added backport bug This issue/PR relates to a bug. labels May 14, 2021
@SharpEdgeMarshall
Copy link
Copy Markdown
Contributor

We should backport CI updates too

@ssbarnea
Copy link
Copy Markdown
Member Author

We should backport CI updates too

Ohh 💩...., that may require an amount of work that nobody will be able to do. The hidden cost of not making any release in more than an year.

@simobasso What can we do to unblock this? The jinja2 and MarkupSafe new releases are causing lots of failures for cookiecutter users. I already found CI/CD on two projects I use and another user made a comment on my fix aking about the backport.

I am wondering if it would not make sense to perform this hotfix manually, including releasing it. It should buy us enough time to make the 2.0.0 release as I doubt we will see many similar problems very soon. It work nothing that these were the only dependencies that were pinned down.

@SharpEdgeMarshall
Copy link
Copy Markdown
Contributor

We could try to backport CI updates, it should not be a big deal.

@ssbarnea ssbarnea closed this May 14, 2021
@ssbarnea ssbarnea reopened this May 14, 2021
@ssbarnea
Copy link
Copy Markdown
Member Author

@SharpEdgeMarshall Apparently GHA refuses to start running any workflows on this branch, even after I updated the conditions. It is supposed to run old jobs names like linting, ubuntu-py27,... but it triggers nothing, the only one listed below are those that I marked as required in branch rules but if you look at actions tab, you will not find anything triggered.

@ssbarnea
Copy link
Copy Markdown
Member Author

After manually adding the branch config I was able to trigger the workflow but only on push (after the merge) see https://github.com/cookiecutter/cookiecutter/actions/runs/841530404

That PR made from my fork towards this the stable branch still does not trigger a thing. I wonder what else I am missing.

@ssbarnea
Copy link
Copy Markdown
Member Author

ssbarnea commented May 14, 2021

Found! Apparently putting pull_request: {} works. Somehow branches: * bit was preventing it from triggering the workflows... another badly documented area on the workflows. It seems that GHA daily life is to look for a repository where it works as intended and copy/paste the changes.

@SharpEdgeMarshall
Copy link
Copy Markdown
Contributor

Actually is documented here:

'*' Matches all branch and tag names that don't contain a slash (/). The * character is a special character in YAML. When you start a pattern with *, you must use quotes. mainreleases
'**' Matches all branch and tag names. This is the default behavior when you don't use a branches or tags filter. all/the/branchesevery/tag

This backports changes already made to master via: cookiecutter#1549 and cookiecutter#1548
@ssbarnea
Copy link
Copy Markdown
Member Author

@SharpEdgeMarshall Do not forget to approve the PR, so I can merge it w/o using admin rights.

@ssbarnea ssbarnea merged commit 8925d8c into cookiecutter:stable/1.7.x May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug This issue/PR relates to a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants