Skip to content

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

Merged
pablogsal merged 4 commits into
python:mainfrom
pablogsal:update_ci
May 3, 2021
Merged

Update CI files to account for the master -> main rename#25860
pablogsal merged 4 commits into
python:mainfrom
pablogsal:update_ci

Conversation

@pablogsal

@pablogsal pablogsal commented May 3, 2021

Copy link
Copy Markdown
Member

No description provided.

@ammaraskar

ammaraskar commented May 3, 2021

Copy link
Copy Markdown
Member

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

@isidentical

isidentical commented May 3, 2021

Copy link
Copy Markdown
Member

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

@vstinner

vstinner commented May 3, 2021

Copy link
Copy Markdown
Member

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

vstinner commented May 3, 2021

Copy link
Copy Markdown
Member

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.

vstinner
vstinner approved these changes May 3, 2021
View reviewed changes

@vstinner vstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🤖 Victor happy 🤖

@vstinner

vstinner commented May 3, 2021

Copy link
Copy Markdown
Member

Windows (x64) Failing:

@vstinner

vstinner commented May 3, 2021

Copy link
Copy Markdown
Member

Windows (x64) Failing:

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

@pablogsal
pablogsal requested a review from a team as a code owner May 3, 2021 21:53
@vstinner

vstinner commented May 3, 2021

Copy link
Copy Markdown
Member

" 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
@pablogsal
pablogsal deleted the update_ci branch May 3, 2021 22:36
@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 gpshead approved these changes
@vstinner vstinner vstinner approved these changes
@ammaraskar ammaraskar ammaraskar approved these changes
@isidentical isidentical isidentical approved these changes

Assignees

No one assigned

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@pablogsal @ammaraskar @isidentical @vstinner @gpshead @the-knights-who-say-ni @bedevere-bot