Skip to content

Update semver logic: one patch version per checklist #7458

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

Merged
timszot merged 11 commits into from
Feb 1, 2022
Merged

Update semver logic: one patch version per checklist #7458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a24f12f
Update getPullRequestsMergedBetween test to remove lock step
roryabraham Jan 29, 2022
719c698
Bump patch version in finishReleaseCycle
roryabraham Jan 29, 2022
9cf6b24
Create awaitStagingDeploys action
roryabraham Jan 29, 2022
a9af7a0
Add unit testing coverage for new action
roryabraham Jan 29, 2022
b38b4b4
Rebuild GH actions
roryabraham Jan 29, 2022
368133f
Update lockDeploys workflow
roryabraham Jan 29, 2022
c9cb462
Update README
roryabraham Jan 29, 2022
eb5a28a
Fix isPullRequestMergeable
roryabraham Jan 29, 2022
d0928db
Remove unnecessary checkout command
roryabraham Jan 31, 2022
0ced2f6
Address race condition for pull requests merged right before lock lab…
roryabraham Jan 31, 2022
f5fc6ad
Rebuild GH actions
roryabraham Jan 31, 2022
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
9 changes: 9 additions & 0 deletions .github/actions/awaitStagingDeploys/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: 'Await staging deploys'
description: 'Waits for any active staging deploys to finish'
inputs:
GITHUB_TOKEN:
description: Auth token for New Expensify Github
required: true
runs:
using: 'node12'
main: './index.js'
48 changes: 48 additions & 0 deletions .github/actions/awaitStagingDeploys/awaitStagingDeploys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
const _ = require('underscore');
const GitHubUtils = require('../../libs/GithubUtils');
const {promiseDoWhile} = require('../../libs/promiseWhile');

function run() {
let currentStagingDeploys = [];
return promiseDoWhile(

@roryabraham roryabraham Jan 31, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

FWIW our async/await ban really kills me here, in my opinion this would be much cleaner written like so:

const _ = require('underscore');
const GitHubUtils = require('../../libs/GithubUtils');

async function run() {
    let currentStagingDeploys = [];
    do {
        const response = await GitHubUtils.octokit.actions.listWorkflowRuns({
            owner: GitHubUtils.GITHUB_OWNER,
            repo: GitHubUtils.APP_REPO,
            workflow_id: 'platformDeploy.yml',
            event: 'push',
        });
        currentStagingDeploys = _.filter(response.data.workflow_runs, workflowRun => workflowRun.status !== 'completed');
        
        console.log(
            _.isEmpty(currentStagingDeploys)
                ? 'No current staging deploys found'
                : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
        );
        
        await new Promise(resolve => setTimeout(resolve, GitHubUtils.POLL_RATE * 9))
    } while(!_.isEmpty(currentStagingDeploys));
}

if (require.main === module) {
    run();
}

module.exports = run;

() => !_.isEmpty(currentStagingDeploys),
_.throttle(
() => Promise.all([
// These are active deploys
GitHubUtils.octokit.actions.listWorkflowRuns({
owner: GitHubUtils.GITHUB_OWNER,
repo: GitHubUtils.APP_REPO,
workflow_id: 'platformDeploy.yml',
event: 'push',
}),

// These have the potential to become active deploys, so we need to wait for them to finish as well
// In this context, we'll refer to unresolved preDeploy workflow runs as staging deploys as well
GitHubUtils.octokit.actions.listWorkflowRuns({
owner: GitHubUtils.GITHUB_OWNER,
repo: GitHubUtils.APP_REPO,
workflow_id: 'preDeploy.yml',
}),
])
.then(responses => [
...responses[0].data.workflow_runs,
...responses[1].data.workflow_runs,
])
.then(workflowRuns => currentStagingDeploys = _.filter(workflowRuns, workflowRun => workflowRun.status !== 'completed'))
.then(() => console.log(
_.isEmpty(currentStagingDeploys)
? 'No current staging deploys found'
: `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
)),

// Poll every 60 seconds instead of every 10 seconds
GitHubUtils.POLL_RATE * 6,
),
);
}

if (require.main === module) {
run();
}

module.exports = run;
Loading