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
Prev Previous commit
Next Next commit
scheduleCircleCI -> schedulePrepare
  • Loading branch information
@jeetiss
jeetiss committed Dec 14, 2019
commit 17acf7275989dadf8f0759ac9f51ab13ee0bb4d7
12 changes: 6 additions & 6 deletions packages/shipjs/src/step/setup/CI/addCircleCIConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import mkdirp from 'mkdirp';
import { print } from '../../../util';
import { info, warning } from '../../../color';

export default ({ baseBranch, scheduleCircleCI, cronExpr, dir, dryRun }) =>
export default ({ baseBranch, schedulePrepare, cronExpr, dir, dryRun }) =>
runStep(
{
title: 'Creating CircleCI configuration',
Expand All @@ -30,7 +30,7 @@ export default ({ baseBranch, scheduleCircleCI, cronExpr, dir, dryRun }) =>
}
const content = getConfig({
baseBranch,
scheduleCircleCI,
schedulePrepare,
cronExpr,
gitUserName: getGitConfig('user.name') || 'Your Name',
gitUserEmail: getGitConfig('user.email') || '[email protected]',
Expand All @@ -54,7 +54,7 @@ export default ({ baseBranch, scheduleCircleCI, cronExpr, dir, dryRun }) =>

function getConfig({
baseBranch,
scheduleCircleCI,
schedulePrepare,
cronExpr,
gitUserName,
gitUserEmail,
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- run:
name: Run Tests
command: yarn test
<% if (scheduleCircleCI) { %>
<% if (schedulePrepare) { %>
prepare_release:
<<: *defaults
steps:
Expand Down Expand Up @@ -141,7 +141,7 @@ workflows:
- release_if_needed:
requires:
- test
<% if (scheduleCircleCI) { %>
<% if (schedulePrepare) { %>
schedule_release:
triggers:
- schedule:
Expand All @@ -154,6 +154,6 @@ workflows:
- prepare_release
<% } %>
`,
{ baseBranch, scheduleCircleCI, cronExpr, gitUserName, gitUserEmail }
{ baseBranch, schedulePrepare, cronExpr, gitUserName, gitUserEmail }
);
}
8 changes: 4 additions & 4 deletions packages/shipjs/src/step/setup/CI/askCircleCI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import inquirer from 'inquirer';
import formatMessage from '../formatMessage';

export default async function askCircleCI() {
const { scheduleCircleCI } = await inquirer.prompt([
const { schedulePrepare } = await inquirer.prompt([
{
type: 'confirm',
name: 'scheduleCircleCI',
name: 'schedulePrepare',
message: 'Schedule your release via CircleCI?',
default: true,
},
Expand All @@ -16,7 +16,7 @@ export default async function askCircleCI() {
const defaultCronExpr = `0 ${hour} * * ${tuesday}`;
const { cronExpr } = await inquirer.prompt(
[
scheduleCircleCI
schedulePrepare
? {
type: 'input',
name: 'cronExpr',
Expand All @@ -31,7 +31,7 @@ export default async function askCircleCI() {
);

return {
scheduleCircleCI,
schedulePrepare,
cronExpr,
};
}