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

feat(setup): add github actions as CI option #502

Merged
merged 23 commits into from
Dec 20, 2019
Merged

feat(setup): add github actions as CI option #502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7ea75c3
prepare setup for github actions
jeetiss Dec 4, 2019
915af26
add base github actions integration
jeetiss Dec 7, 2019
2be0e05
add manual prepare config generation
jeetiss Dec 7, 2019
fe2d8b0
fix
jeetiss Dec 7, 2019
f4aa4e0
checkout to base branch
jeetiss Dec 8, 2019
16003bf
Merge branch 'master' into feat-github-actions
jeetiss Dec 8, 2019
20bdee3
Merge branch 'master' into feat-github-actions
jeetiss Dec 14, 2019
a20a9a6
switch to release branch before trigger
jeetiss Dec 14, 2019
b77d6bc
add schedule config
jeetiss Dec 14, 2019
17acf72
scheduleCircleCI -> schedulePrepare
jeetiss Dec 14, 2019
c858481
rename NPM_TOKEN to NPM_AUTH_TOKEN for consistency
jeetiss Dec 14, 2019
f4bbde4
fix vars names and typos
jeetiss Dec 17, 2019
3011f8e
Github to GitHub
jeetiss Dec 17, 2019
89d2e1e
fix typo
jeetiss Dec 17, 2019
e452c53
fix prepare
jeetiss Dec 17, 2019
73c9b09
return ciIntegration
jeetiss Dec 17, 2019
4abc211
chore: rename files
Dec 17, 2019
eeecd0f
Merge branch 'master' into feat-github-actions
Dec 17, 2019
66b1032
fix formatting
jeetiss Dec 18, 2019
56eaeb0
use duble quotes in gh actions
jeetiss Dec 19, 2019
76a2548
use single quote in condition
jeetiss Dec 19, 2019
11fc704
use bash if statement to choose package manager
jeetiss Dec 20, 2019
9ef5101
Merge branch 'master' into feat-github-actions
Dec 20, 2019
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
8 changes: 4 additions & 4 deletions packages/shipjs/src/flow/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ async function setup({ help = false, dir = '.', dryRun = false }) {
packagesToPublish,
isScoped,
isPublic,
CIIndex,
CIConfig,
ciIntegration,
ciConfig,
} = await askQuestions({ dir });
jeetiss marked this conversation as resolved.
Show resolved Hide resolved
const outputs = [
addDevDependencies({ dependencies: ['shipjs'], dir, dryRun }),
Expand All @@ -43,8 +43,8 @@ async function setup({ help = false, dir = '.', dryRun = false }) {
dir,
dryRun,
}),
integrations[CIIndex].addConfig({
...CIConfig,
integrations[ciIntegration].addConfig({
...ciConfig,
isScoped,
isPublic,
baseBranch,
Expand Down
7 changes: 6 additions & 1 deletion packages/shipjs/src/step/setup/CI/addGithubActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,12 @@ name: Ship js Manual Prepare
);
}

function getScheduleConfig({ baseBranch, cronExpr, gitUserName, gitUserEmail }) {
function getScheduleConfig({
baseBranch,
cronExpr,
gitUserName,
gitUserEmail,
}) {
return ejs.render(
`
name: Ship js Schedule Prepare
Expand Down
2 changes: 1 addition & 1 deletion packages/shipjs/src/step/setup/CI/askGithubActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ export default async function askGithubActions() {
return {
manualPrepare,
schedulePrepare,
cronExpr
cronExpr,
};
}
6 changes: 3 additions & 3 deletions packages/shipjs/src/step/setup/CI/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ const noop = () => ({});
export default [
{
name: 'Circle CI',
askQustions: askCircleCI,
askQuestions: askCircleCI,
addConfig: addCircleCIConfig,
},
{
name: 'Github Actions',
askQustions: askGithubActions,
askQuestions: askGithubActions,
addConfig: addGithubActions,
},
{
name: 'Nothing',
askQustions: noop,
askQuestions: noop,
addConfig: noop,
},
];
16 changes: 8 additions & 8 deletions packages/shipjs/src/step/setup/askQuestions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import runStep from '../runStep';
export default async ({ dir }) =>
await runStep({}, async () => {
const { baseBranch, releaseBranch } = await askBranches(dir);
const { CIIndex, CIConfig } = await askCI(dir);
const { ciIntegration, ciConfig } = await askCI(dir);
const {
useMonorepo,
mainVersionFile,
Expand All @@ -22,8 +22,8 @@ export default async ({ dir }) =>
return {
baseBranch,
releaseBranch,
CIIndex,
CIConfig,
ciIntegration,
ciConfig,
useMonorepo,
mainVersionFile,
packagesToBump,
Expand Down Expand Up @@ -73,19 +73,19 @@ async function askBranches(dir) {

async function askCI() {
const choices = integrations.map(config => config.name);
const { CITypeText } = await inquirer.prompt([
const { ciTypeText } = await inquirer.prompt([
{
type: 'list',
name: 'CITypeText',
name: 'ciTypeText',
message: 'Which CI configure?',
choices,
},
]);

const CIIndex = choices.indexOf(CITypeText);
const CIConfig = await integrations[CIIndex].askQustions();
const ciIntegration = choices.indexOf(ciTypeText);
const ciConfig = await integrations[ciIntegration].askQuestions();
jeetiss marked this conversation as resolved.
Show resolved Hide resolved

return { CIIndex, CIConfig };
return { ciIntegration, ciConfig };
}

async function askMonorepo(dir) {
Expand Down