Skip to content

Commit

Permalink
Merge pull request #83 from emulsify-ds/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ModulesUnraveled authored Dec 23, 2021
2 parents 2d8967f + f01ca72 commit 4c29ab9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@ Emulsify-cli is developed using TypeScript. You can find all of the source files
- `npm run test`: runs Jest on the codebase. You can specify a path to a single test, and add any flags supported by Jest's CLI.
- `npm run type`: uses typescript to check all type signatures.
- `npm run twatch`: runs Jest without coverage, in verbose and watch mode. This is useful for running a single test during active development.

## Deployment

This project is automatically built and deployed to NPM via a GitHub Actions workflow. In order to deploy changes merged into the `develop` branch, simply merge `develop` into `main`, and call it a day.
2 changes: 1 addition & 1 deletion src/handlers/init.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ describe('init', () => {
).toHaveBeenCalledWith(
'https://github.com/emulsify-ds/emulsify-drupal.git',
'/home/uname/Projects/cornflake/themes/cornflake',
{ '--branch': 'cli' }
{ '--branch': 'master' }
);
expect(
rmdirMock
Expand Down
4 changes: 2 additions & 2 deletions src/handlers/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { EXIT_ERROR } from '../lib/constants';
const git = simpleGit();

/**
* Handler for the initalization command.
* Handler for the initialization command.
*
* @param name name of the project being initialized.
* @param targetDirectory relative path to the directory in which the project must be initialized.
Expand Down Expand Up @@ -154,7 +154,7 @@ export default function init(progress: InstanceType<typeof ProgressBar>) {

// Remove the .git directory, as this is a starter kit. This step
// should happen after dependencies are installed, and init scripts are
// executed, otherwise git-reliant dev deps in the starter may eror out.
// executed, otherwise git-reliant dev deps in the starter may error out.
await fs.rmdir(join(target, '.git'), { recursive: true });

progress.tick(10, {
Expand Down
2 changes: 1 addition & 1 deletion src/util/getAvailableStarters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ describe('getAvailableStarters', () => {
expect(getAvailableStarters()).toMatchInlineSnapshot(`
Array [
Object {
"checkout": "cli",
"checkout": "master",
"platform": "drupal",
"platformMajorVersion": 9,
"repository": "https://github.com/emulsify-ds/emulsify-drupal.git",
Expand Down
2 changes: 1 addition & 1 deletion src/util/getAvailableStarters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function getAvailableStarters(): EmulsifyStarter[] {
platform: 'drupal',
platformMajorVersion: 9,
repository: 'https://github.com/emulsify-ds/emulsify-drupal.git',
checkout: 'cli',
checkout: 'master',
},
];
}

0 comments on commit 4c29ab9

Please sign in to comment.