Skip to content

Commit f533065

Browse files
committed
fix: is the version pinning the issue?
1 parent 061a5dd commit f533065

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.circleci/config.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ windows_big: &windows_big
4141
name: win/server-2022
4242
shell: bash.exe
4343
size: large
44+
# we've pinned the version because without it, it uses "current" (at the time of writing, "2023.06.1"),
45+
# which has a broken Docker installation. See https://discuss.circleci.com/t/build-failures-when-running-docker-on-junes-windows-executor/48605
46+
# TODO: check if it works again with the next release and unpin the version.
47+
version: 2023.05.1
4448
parameters:
4549
node_version:
4650
type: string
@@ -185,11 +189,11 @@ jobs:
185189
command: |
186190
GLOB=$(circleci tests glob "test/windows/**/*.spec.ts")
187191
echo "GLOB: $GLOB"
188-
GLOB_SED=$(echo $GLOB | sed 's#\\\\#/#g')
192+
GLOB_SED=$(echo $GLOB | sed s#$(pwd)/##g | sed 's#\\\\#/#g')
189193
echo "GLOB_SED: $GLOB_SED"
190194
LIST_TEST=$(npx jest --listTests --config test/windows/jest.config.js)
191195
echo "LIST_TEST: $LIST_TEST"
192-
LIST_TEST_SED=$(echo $LIST_TEST | sed 's#\\\\#/#g')
196+
LIST_TEST_SED=$(echo $LIST_TEST | sed s#$(pwd)/##g | sed 's#\\\\#/#g')
193197
echo "LIST_TEST_SED: $LIST_TEST_SED"
194198
TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
195199
echo "TEST: $TEST"

test/windows/plugin.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ describe("windows scanning", () => {
110110
)!.data;
111111
expect(imageLayers.length).toBeGreaterThan(0);
112112
expect(
113-
imageLayers.every((layer) => layer.endsWith("layer.tar")),
113+
imageLayers.every((layer) => path.basename(layer) === "layer.tar"),
114114
).toBeTruthy();
115115
expect(pluginResult.scanResults[0].identity.args?.platform).toEqual(
116116
"windows/amd64",

0 commit comments

Comments
 (0)