Skip to content

Commit d344961

Browse files
authored
Merge pull request #345 from crazy-max/move-types
move types to the right place
2 parents 5958c82 + a033bb7 commit d344961

22 files changed

+17
-17
lines changed

__tests__/buildkit/buildkit.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
1919
import {BuildKit} from '../../src/buildkit/buildkit';
2020
import {Builder} from '../../src/buildx/builder';
2121

22-
import {BuilderInfo} from '../../src/types/builder';
22+
import {BuilderInfo} from '../../src/types/buildx/builder';
2323

2424
beforeEach(() => {
2525
jest.clearAllMocks();

__tests__/buildx/bake.test.itg.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import * as fs from 'fs';
1919
import * as path from 'path';
2020

2121
import {Bake} from '../../src/buildx/bake';
22-
import {BakeDefinition} from '../../src/types/bake';
22+
import {BakeDefinition} from '../../src/types/buildx/bake';
2323

2424
const fixturesDir = path.join(__dirname, '..', 'fixtures');
2525

__tests__/buildx/bake.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {Bake} from '../../src/buildx/bake';
2323
import {Context} from '../../src/context';
2424

2525
import {ExecOptions} from '@actions/exec';
26-
import {BakeDefinition, BakeMetadata} from '../../src/types/bake';
26+
import {BakeDefinition, BakeMetadata} from '../../src/types/buildx/bake';
2727

2828
const fixturesDir = path.join(__dirname, '..', 'fixtures');
2929
// prettier-ignore

__tests__/buildx/build.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import * as rimraf from 'rimraf';
2222
import {Context} from '../../src/context';
2323
import {Build} from '../../src/buildx/build';
2424

25-
import {BuildMetadata} from '../../src/types/build';
25+
import {BuildMetadata} from '../../src/types/buildx/build';
2626

2727
const fixturesDir = path.join(__dirname, '..', 'fixtures');
2828
// prettier-ignore

__tests__/buildx/builder.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import * as path from 'path';
2121
import {Builder} from '../../src/buildx/builder';
2222
import {Exec} from '../../src/exec';
2323

24-
import {BuilderInfo} from '../../src/types/builder';
24+
import {BuilderInfo} from '../../src/types/buildx/builder';
2525

2626
const fixturesDir = path.join(__dirname, '..', 'fixtures');
2727

__tests__/buildx/buildx.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {Buildx} from '../../src/buildx/buildx';
2424
import {Context} from '../../src/context';
2525
import {Exec} from '../../src/exec';
2626

27-
import {Cert} from '../../src/types/buildx';
27+
import {Cert} from '../../src/types/buildx/buildx';
2828

2929
const fixturesDir = path.join(__dirname, '..', 'fixtures');
3030
// prettier-ignore

__tests__/docker/docker.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import * as rimraf from 'rimraf';
2424
import {Docker} from '../../src/docker/docker';
2525
import {Exec} from '../../src/exec';
2626

27-
import {ConfigFile} from '../../src/types/docker';
27+
import {ConfigFile} from '../../src/types/docker/docker';
2828

2929
const fixturesDir = path.join(__dirname, '..', 'fixtures');
3030

src/buildkit/buildkit.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {Builder} from '../buildx/builder';
2222
import {Config} from './config';
2323
import {Exec} from '../exec';
2424

25-
import {BuilderInfo, NodeInfo} from '../types/builder';
25+
import {BuilderInfo, NodeInfo} from '../types/buildx/builder';
2626

2727
export interface BuildKitOpts {
2828
buildx?: Buildx;

src/buildx/bake.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {Exec} from '../exec';
2424
import {Util} from '../util';
2525

2626
import {ExecOptions} from '@actions/exec';
27-
import {BakeDefinition, BakeMetadata} from '../types/bake';
27+
import {BakeDefinition, BakeMetadata} from '../types/buildx/bake';
2828

2929
export interface BakeOpts {
3030
buildx?: Buildx;

src/buildx/build.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {Context} from '../context';
2424
import {GitHub} from '../github';
2525
import {Util} from '../util';
2626

27-
import {BuildMetadata} from '../types/build';
27+
import {BuildMetadata} from '../types/buildx/build';
2828

2929
export interface BuildOpts {
3030
buildx?: Buildx;

src/buildx/builder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import * as core from '@actions/core';
1919
import {Buildx} from './buildx';
2020
import {Exec} from '../exec';
2121

22-
import {BuilderInfo, GCPolicy, NodeInfo} from '../types/builder';
22+
import {BuilderInfo, GCPolicy, NodeInfo} from '../types/buildx/builder';
2323

2424
export interface BuilderOpts {
2525
buildx?: Buildx;

src/buildx/buildx.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import * as semver from 'semver';
2222
import {Docker} from '../docker/docker';
2323
import {Exec} from '../exec';
2424

25-
import {Cert, LocalRefsOpts, LocalRefsResponse, LocalState} from '../types/buildx';
25+
import {Cert, LocalRefsOpts, LocalRefsResponse, LocalState} from '../types/buildx/buildx';
2626

2727
export interface BuildxOpts {
2828
standalone?: boolean;

src/buildx/history.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {Docker} from '../docker/docker';
2727
import {Exec} from '../exec';
2828
import {GitHub} from '../github';
2929

30-
import {ExportRecordOpts, ExportRecordResponse, Summaries} from '../types/history';
30+
import {ExportRecordOpts, ExportRecordResponse, Summaries} from '../types/buildx/history';
3131

3232
export interface HistoryOpts {
3333
buildx?: Buildx;

src/buildx/install.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import {Docker} from '../docker/docker';
3131
import {Git} from '../git';
3232
import {Util} from '../util';
3333

34-
import {DownloadVersion} from '../types/buildx';
34+
import {DownloadVersion} from '../types/buildx/buildx';
3535
import {GitHubRelease} from '../types/github';
3636

3737
export interface InstallOpts {

src/docker/docker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {Cache} from '../cache';
2525
import {Exec} from '../exec';
2626
import {Util} from '../util';
2727

28-
import {ConfigFile} from '../types/docker';
28+
import {ConfigFile} from '../types/docker/docker';
2929

3030
export class Docker {
3131
static get configDir(): string {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/types/github.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import {components as OctoOpenApiTypes} from '@octokit/openapi-types';
1818
import {JwtPayload} from 'jwt-decode';
1919

20-
import {BakeDefinition} from './bake';
21-
import {ExportRecordResponse} from './history';
20+
import {BakeDefinition} from './buildx/bake';
21+
import {ExportRecordResponse} from './buildx/history';
2222

2323
export interface GitHubRelease {
2424
id: number;

0 commit comments

Comments
 (0)