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

Jump to bottom

Update CI files to account for the master -> main rename #25860

Merged
merged 4 commits into from May 3, 2021
Merged

Update CI files to account for the master -> main rename #25860

merged 4 commits into from May 3, 2021
+1,881 −2,040

Conversation

@pablogsal
Copy link
Member

@pablogsal pablogsal commented May 3, 2021

No description provided.

@pablogsal
Update CI files to account for the master -> main rename
07a0bb8
gpshead
gpshead approved these changes May 3, 2021
View changes
@ammaraskar
Copy link
Member

@ammaraskar ammaraskar commented May 3, 2021

.azure-pipelines needs an update too or is @zooba taking care of that?

@isidentical
Copy link
Member

@isidentical isidentical commented May 3, 2021

Do we need to update Doc/tools/templates/customsourcelink.html:7 for the docs as well?

@vstinner
Copy link
Member

@vstinner vstinner commented May 3, 2021

You forgot:

.azure-pipelines/ci.yml:4:trigger: ['master', '3.9', '3.8', '3.7']
.azure-pipelines/pr.yml:4:pr: ['master', '3.9', '3.8', '3.7']

.github/CONTRIBUTING.rst:7:- master
.github/PULL_REQUEST_TEMPLATE.md:19:If this is a backport PR (PR made against branches other than `master`),
.github/PULL_REQUEST_TEMPLATE.md:28:GH-NNNN refers to the PR number from `master`.

.travis.yml:24:    - master

@vstinner
Copy link
Member

@vstinner vstinner commented May 3, 2021

Do we need to update Doc/tools/templates/customsourcelink.html:7 for the docs as well?

I suggest to restrict this PR to CI files, to be able to merge it quickly. But yeah, it sounds like this file should be updated as well.

@pablogsal
Moar main
e03883b
gpshead
gpshead approved these changes May 3, 2021
View changes
vstinner
vstinner approved these changes May 3, 2021
View changes
Copy link
Member

@vstinner vstinner left a comment

🤖 Victor happy 🤖

@vstinner
Copy link
Member

@vstinner vstinner commented May 3, 2021

Windows (x64) Failing:

@vstinner
Copy link
Member

@vstinner vstinner commented May 3, 2021

Windows (x64) Failing:

LINK : fatal error LNK1104: cannot open file 'python310.lib' [D:\a\cpython\cpython\PCbuild\_ctypes_test.vcxproj]

@pablogsal
Update windows files
195c64c
@pablogsal pablogsal requested a review from as a code owner May 3, 2021
@pablogsal
Update autotools files
4ec721a
@vstinner
Copy link
Member

@vstinner vstinner commented May 3, 2021

" bedevere/maintenance-branch-pr — Not a valid maintenance branch PR title. "

Oh oh, maybe this bot is going to hold the PR... I created python/bedevere#337

@pablogsal pablogsal merged commit 2fc857a into python:main May 3, 2021
12 of 13 checks passed
@pablogsal pablogsal deleted the update_ci branch May 3, 2021
@perlun perlun mentioned this pull request Oct 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gpshead gpshead

@vstinner vstinner

@ammaraskar ammaraskar

@isidentical isidentical

@python/windows-team windows-team

Assignees
No one assigned
Labels
CLA signed skip issue skip news
Projects
None yet
Milestone
No milestone
7 participants
@pablogsal @ammaraskar @isidentical @vstinner @gpshead @the-knights-who-say-ni @bedevere-bot