Rename builder folder to action folder (unity actions convention)

This commit is contained in:
Webber
2020-02-01 20:21:22 +01:00
committed by Webber Takken
parent d8896dc4f5
commit f3a984165e
43 changed files with 27 additions and 23 deletions

View File

@@ -6,12 +6,12 @@ async function action() {
Action.checkCompatibility();
Cache.verify();
const { dockerfile, workspace, builderFolder } = Action;
const { dockerfile, workspace, actionFolder } = Action;
const buildParameters = BuildParameters.create(Input.getFromUser());
const baseImage = new ImageTag(buildParameters);
// Build docker image
const builtImage = await Docker.build({ path: builderFolder, dockerfile, baseImage });
const builtImage = await Docker.build({ path: actionFolder, dockerfile, baseImage });
// Run docker image
await Docker.run(builtImage, { workspace, ...buildParameters });

View File

@@ -25,12 +25,12 @@ class Action {
return path.dirname(path.dirname(__filename));
}
static get builderFolder() {
return `${Action.rootFolder}/builder`;
static get actionFolder() {
return `${Action.rootFolder}/action`;
}
static get dockerfile() {
return `${Action.builderFolder}/Dockerfile`;
return `${Action.actionFolder}/Dockerfile`;
}
static get workspace() {

View File

@@ -20,11 +20,11 @@ describe('Action', () => {
expect(fs.existsSync(rootFolder)).toStrictEqual(true);
});
it('returns the builder folder', () => {
const { builderFolder } = Action;
it('returns the action folder', () => {
const { actionFolder } = Action;
expect(path.basename(builderFolder)).toStrictEqual('builder');
expect(fs.existsSync(builderFolder)).toStrictEqual(true);
expect(path.basename(actionFolder)).toStrictEqual('action');
expect(fs.existsSync(actionFolder)).toStrictEqual(true);
});
it('returns the docker file', () => {

View File

@@ -4,7 +4,7 @@ import ImageTag from './image-tag';
describe('Docker', () => {
it('builds', async () => {
const path = Action.builderFolder;
const path = Action.actionFolder;
const dockerfile = `${path}/Dockerfile`;
const baseImage = new ImageTag({
repository: '',