Skip to content

Commit eb4533e

Browse files
committed
fix: remove committed dist, fix AzDO doc copy-paste, merge redundant test
- Remove github-action/dist/ from tracking (upstream compiles in CI per PR #210) - Fix "GitHub Actions Runner" -> "Azure Pipelines agent" in azure-devops-task.md - Merge redundant "returns true" test into the existing happy-path test
1 parent 34c8889 commit eb4533e

6 files changed

Lines changed: 2 additions & 31350 deletions

File tree

common/__tests__/platform.test.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,11 @@ describe('mergeMultiPlatformImages', () => {
3535
.mockResolvedValue(true);
3636
const log = jest.fn();
3737

38-
await mergeMultiPlatformImages('img', ['v1', 'latest'], 'linux-amd64,linux-arm64', createFn, log);
38+
const result = await mergeMultiPlatformImages('img', ['v1', 'latest'], 'linux-amd64,linux-arm64', createFn, log);
3939

4040
expect(createFn).toHaveBeenCalledTimes(2);
4141
expect(createFn).toHaveBeenNthCalledWith(1, 'img', 'v1', ['linux-amd64', 'linux-arm64']);
4242
expect(createFn).toHaveBeenNthCalledWith(2, 'img', 'latest', ['linux-amd64', 'linux-arm64']);
43-
});
44-
45-
test('returns true when all createFn calls succeed', async () => {
46-
const createFn = jest.fn<Promise<boolean>, [string, string, string[]]>()
47-
.mockResolvedValue(true);
48-
const log = jest.fn();
49-
50-
const result = await mergeMultiPlatformImages('img', ['v1', 'latest'], 'linux-amd64,linux-arm64', createFn, log);
51-
5243
expect(result).toBe(true);
5344
});
5445

docs/azure-devops-task.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ In the example above, the devcontainer-build-run will perform the following step
8383
| cacheFrom | false | Specify additional images to use for build caching |
8484
| noCache | false | Builds the image with `--no-cache` (takes precedence over `cacheFrom`) |
8585
| cacheTo | false | Specify the image to cache the built image to |
86-
| platform | false | Platforms for which the image should be built. If omitted, defaults to the platform of the GitHub Actions Runner. Multiple platforms should be comma separated. Ignored when `platformTag` is set (matrix mode). |
86+
| platform | false | Platforms for which the image should be built. If omitted, defaults to the platform of the Azure Pipelines agent. Multiple platforms should be comma separated. Ignored when `platformTag` is set (matrix mode). |
8787
| platformTag | false | Tag suffix for this platform build (e.g., `linux-amd64`). In matrix builds, this controls which per-platform image is built and tagged; when set, `platform` is ignored. Used to push per-platform images that are later merged into a multi-arch manifest. |
8888
| mergeTag | false | Comma-separated list of platform tags to merge into a multi-arch manifest (e.g., `linux-amd64,linux-arm64`). When set, the task skips building an image and instead merges previously built `platformTag` images in the merge job after matrix builds complete. |
8989

0 commit comments

Comments
 (0)