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 diff --git a/src/test/suite/convertFormat.test.ts b/src/test/suite/convertFormat.test.ts index 5a898dd..7f4afa2 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(8000); + 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..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(80_000); + this.timeout(300_000); // start a maria db container and wait for its status await DockerTestUtils.startContainer();