From 661c2af7cf47560633b9c9a1a04f127f594f0231 Mon Sep 17 00:00:00 2001 From: Ramona Hartinger Date: Fri, 20 Sep 2024 06:25:26 +0200 Subject: [PATCH 1/3] ci: adding macOs runner with docker setup --- .github/workflows/nodejs.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 07f155c..779a321 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -12,7 +12,7 @@ jobs: # Therefore, we can not install and start a docker container in the WSL. # Currently, no macOS runner, because during the setup of docker, this runner hangs: https://github.com/douglascamata/setup-docker-macos-action/issues/37 - os: [ubuntu-latest] + os: [ubuntu-latest, macos-13] node-version: [18.x, 20.x, 22.x] runs-on: ${{ matrix.os }} steps: @@ -28,6 +28,10 @@ jobs: java-version: 21 distribution: temurin + - name: Set up docker for macOS + if: runner.os == 'macOS' + uses: douglascamata/setup-docker-macos-action@v1-alpha.14 + - name: Check Docker Version run: docker --version From f5114bb9e797f00c46ddb43f578080f96cae51a5 Mon Sep 17 00:00:00 2001 From: Ramona Hartinger Date: Fri, 20 Sep 2024 06:44:04 +0200 Subject: [PATCH 2/3] test: updated some timeouts in tests --- src/test/suite/convertFormat.test.ts | 4 +++- src/test/suite/extension.it.test.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/suite/convertFormat.test.ts b/src/test/suite/convertFormat.test.ts index 5a898dd..48a8547 100644 --- a/src/test/suite/convertFormat.test.ts +++ b/src/test/suite/convertFormat.test.ts @@ -121,7 +121,9 @@ suite("convert format", () => { */ test(`should transform ${pArgument.format} with ${pArgument.fileSelection ? "file" : "folder"} ${ pArgument.changelogLocation - } ${typeof pArgument.changelogLocation !== "string" ? "selected from rmb" : ""}`, async () => { + } ${typeof pArgument.changelogLocation !== "string" ? "selected from rmb" : ""}`, async function () { + this.timeout(4000); + const infoMessage = TestUtils.createInfoMessageStubWithSelection(); await assertConverting( diff --git a/src/test/suite/extension.it.test.ts b/src/test/suite/extension.it.test.ts index 7751238..ca18516 100644 --- a/src/test/suite/extension.it.test.ts +++ b/src/test/suite/extension.it.test.ts @@ -35,7 +35,7 @@ suite("Extension Integration Test Suite", () => { * Also creates a properties file for the test. */ suiteSetup("init extension and properties file", async function () { - this.timeout(80_000); + this.timeout(180_000); // start a maria db container and wait for its status await DockerTestUtils.startContainer(); From c5221ca406b049a96e8ca07753313a12dd18f98d Mon Sep 17 00:00:00 2001 From: Ramona Hartinger Date: Fri, 20 Sep 2024 07:27:16 +0200 Subject: [PATCH 3/3] test: updated timeouts once more for macOS runner --- src/test/suite/convertFormat.test.ts | 2 +- src/test/suite/extension.it.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/suite/convertFormat.test.ts b/src/test/suite/convertFormat.test.ts index 48a8547..7f4afa2 100644 --- a/src/test/suite/convertFormat.test.ts +++ b/src/test/suite/convertFormat.test.ts @@ -122,7 +122,7 @@ suite("convert format", () => { test(`should transform ${pArgument.format} with ${pArgument.fileSelection ? "file" : "folder"} ${ pArgument.changelogLocation } ${typeof pArgument.changelogLocation !== "string" ? "selected from rmb" : ""}`, async function () { - this.timeout(4000); + this.timeout(8000); const infoMessage = TestUtils.createInfoMessageStubWithSelection(); diff --git a/src/test/suite/extension.it.test.ts b/src/test/suite/extension.it.test.ts index ca18516..3e83b5c 100644 --- a/src/test/suite/extension.it.test.ts +++ b/src/test/suite/extension.it.test.ts @@ -35,7 +35,7 @@ suite("Extension Integration Test Suite", () => { * Also creates a properties file for the test. */ suiteSetup("init extension and properties file", async function () { - this.timeout(180_000); + this.timeout(300_000); // start a maria db container and wait for its status await DockerTestUtils.startContainer();