Skip to content

Commit 4f0696b

Browse files
committed
test: disable docker install tests on macos
Signed-off-by: CrazyMax <[email protected]>
1 parent f0de40c commit 4f0696b

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

.github/workflows/test.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -109,25 +109,27 @@ jobs:
109109
for (const os of ['ubuntu-latest', 'ubuntu-24.04-arm', 'macos-15-intel', 'windows-latest']) {
110110
for (const test of tests) {
111111
if (test === 'docker/install.test.itg.ts') {
112-
const allowFailure = os.startsWith('macos');
113-
if (os !== 'windows-latest') {
114-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: '27.3.1', allow_failure: allowFailure });
115-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: 'master', allow_failure: allowFailure });
116-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: 'latest', allow_failure: allowFailure });
112+
// FIXME: docker install tests on macOS are currently broken: https://github.com/docker/actions-toolkit/issues/852
113+
if (!os.startsWith('macos')) {
114+
if (os !== 'windows-latest') {
115+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: '27.3.1' });
116+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: 'master' });
117+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'image', docker_install_version: 'latest' });
118+
}
119+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'v26.1.4' });
120+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'latest' });
121+
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'v29.0.0-rc.1', docker_install_channel: 'test' });
122+
if (os === 'ubuntu-latest') {
123+
includes.push({ os: os, test: test, test_name: 'rootless', docker_install_type: 'image', docker_install_version: 'latest' });
124+
includes.push({ os: os, test: test, test_name: 'rootless', docker_install_type: 'archive', docker_install_version: 'latest' });
125+
}
126+
if (os !== 'windows-latest') {
127+
includes.push({ os: os, test: test, test_name: 'tcp', docker_install_type: 'image', docker_install_version: 'latest' });
128+
}
129+
includes.push({ os: os, test: test, test_name: 'tcp', docker_install_type: 'archive', docker_install_version: 'latest' });
117130
}
118-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'v26.1.4', allow_failure: allowFailure });
119-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'latest', allow_failure: allowFailure });
120-
includes.push({ os: os, test: test, test_name: 'root', docker_install_type: 'archive', docker_install_version: 'v29.0.0-rc.1', docker_install_channel: 'test', allow_failure: allowFailure });
121-
if (os === 'ubuntu-latest') {
122-
includes.push({ os: os, test: test, test_name: 'rootless', docker_install_type: 'image', docker_install_version: 'latest', allow_failure: allowFailure });
123-
includes.push({ os: os, test: test, test_name: 'rootless', docker_install_type: 'archive', docker_install_version: 'latest', allow_failure: allowFailure });
124-
}
125-
if (os !== 'windows-latest') {
126-
includes.push({ os: os, test: test, test_name: 'tcp', docker_install_type: 'image', docker_install_version: 'latest', allow_failure: allowFailure });
127-
}
128-
includes.push({ os: os, test: test, test_name: 'tcp', docker_install_type: 'archive', docker_install_version: 'latest', allow_failure: allowFailure });
129131
} else {
130-
includes.push({ os: os, test: test, allow_failure: false });
132+
includes.push({ os: os, test: test });
131133
}
132134
}
133135
}
@@ -141,7 +143,6 @@ jobs:
141143
142144
test-itg:
143145
runs-on: ${{ matrix.os }}
144-
continue-on-error: ${{ matrix.allow_failure }}
145146
needs:
146147
- prepare-itg
147148
strategy:

0 commit comments

Comments
 (0)