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.

Sign up for GitHub

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

[NoQA] Attempt to fix the checklists including already released PRs #28742

Closed
wants to merge 3 commits into from
Closed

[NoQA] Attempt to fix the checklists including already released PRs #28742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fd6210
Get strict difference between the tags so we dont fetch ancestor commits
mountiny Oct 3, 2023
508c7c3
Build actions
mountiny Oct 3, 2023
5b487e4
Update the tests
mountiny Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/javascript/createOrUpdateStagingDeploy/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) {
return new Promise((resolve, reject) => {
let stdout = '';
let stderr = '';
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}...${toTag}`];
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}..${toTag}`];
console.log(`Running command: git ${args.join(' ')}`);
const spawnedProcess = spawn('git', args);
spawnedProcess.on('message', console.log);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/getDeployPullRequestList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) {
return new Promise((resolve, reject) => {
let stdout = '';
let stderr = '';
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}...${toTag}`];
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}..${toTag}`];
console.log(`Running command: git ${args.join(' ')}`);
const spawnedProcess = spawn('git', args);
spawnedProcess.on('message', console.log);
Expand Down
2 changes: 1 addition & 1 deletion .github/libs/GitUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) {
return new Promise((resolve, reject) => {
let stdout = '';
let stderr = '';
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}...${toTag}`];
const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}..${toTag}`];
console.log(`Running command: git ${args.join(' ')}`);
const spawnedProcess = spawn('git', args);
spawnedProcess.on('message', console.log);
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/finishReleaseCycle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
issues:
types: [closed]

# The updateProduction and createNewStagingDeployCash jobs are executed when a StagingDeployCash is closed.
# The updateProduction, createNewPatchVersion and updateStaging jobs are executed when a StagingDeployCash is closed.
jobs:
validate:
runs-on: ubuntu-latest
Expand Down
13 changes: 7 additions & 6 deletions tests/unit/CIGitLogicTest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ update_staging_from_main
tag_staging

# Verify output for new checklist and staging deploy comments
assert_prs_merged_between '1.0.0-2' '1.0.1-0' "[ 2 ]"
# We also include the cherry picked PR 3 which is issue we will fix later
assert_prs_merged_between '1.0.0-2' '1.0.1-0' "[ 3, 2 ]"

success "Scenario #4B completed successfully!"

Expand All @@ -284,7 +285,7 @@ update_staging_from_main
tag_staging

# Verify output for checklist
assert_prs_merged_between '1.0.0-2' '1.0.1-1' "[ 5, 2 ]"
assert_prs_merged_between '1.0.0-2' '1.0.1-1' "[ 5, 3, 2 ]"

# Verify output for deploy comment
assert_prs_merged_between '1.0.1-0' '1.0.1-1' "[ 5 ]"
Expand All @@ -307,7 +308,7 @@ update_staging_from_main
tag_staging

# Verify output for checklist
assert_prs_merged_between '1.0.0-2' '1.0.1-2' "[ 6, 5, 2 ]"
assert_prs_merged_between '1.0.0-2' '1.0.1-2' "[ 6, 5, 3, 2 ]"

# Verify output for deploy comment
assert_prs_merged_between '1.0.1-1' '1.0.1-2' "[ 6 ]"
Expand All @@ -329,7 +330,7 @@ update_staging_from_main
tag_staging

# Verify output for checklist
assert_prs_merged_between '1.0.0-2' '1.0.1-3' "[ 7, 6, 5, 2 ]"
assert_prs_merged_between '1.0.0-2' '1.0.1-3' "[ 7, 6, 5, 3, 2 ]"

# Verify output for deploy comment
assert_prs_merged_between '1.0.1-2' '1.0.1-3' "[ 7 ]"
Expand Down Expand Up @@ -389,10 +390,10 @@ update_staging_from_main
tag_staging

# Verify production release list
assert_prs_merged_between '1.0.0-2' '1.0.1-4' "[ 9, 7, 6, 5, 2 ]"
assert_prs_merged_between '1.0.0-2' '1.0.1-4' "[ 9, 7, 6, 5, 3, 2 ]"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the places the PR 3 has been added is because this PR was CPed to 1.0.1 here


# Verify PR list for the new checklist
assert_prs_merged_between '1.0.1-4' '1.0.2-0' "[ 10, 8 ]"
assert_prs_merged_between '1.0.1-4' '1.0.2-0' "[ 10, 9, 8 ]"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is because the PR 9 has been CPed here


### Cleanup
title "Cleaning up..."
Expand Down
Loading