From cfe940a9feb5d804e7fac4d8a2041e0bd4a18413 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Wed, 9 Aug 2023 23:36:09 +0200 Subject: [PATCH] Upgrade avast docker compose plugin to 0.17.4 and compose v2 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- autobahn-tests/build.gradle.kts | 3 --- gradle/libs.versions.toml | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02eb8952a..2ebc3e458 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,10 +29,10 @@ jobs: # Docker is not installed on GitHub's MacOS hosted workers due to licensing issues # (and it's necessary to run Autobahn tests) - - name: Setup docker and docker-compose (missing on MacOS) + - name: Setup docker (missing on MacOS) if: runner.os == 'macos' run: | - brew install docker docker-compose + brew install docker # Using mount-type 9p to allow the containers launched via docker-compose to chown # https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d12183504..3a50d5b58 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,10 +25,10 @@ jobs: # Docker is not installed on GitHub's MacOS hosted workers due to licensing issues # (and it's necessary to run Autobahn tests) - - name: Setup docker and docker-compose (missing on MacOS) + - name: Setup docker (missing on MacOS) if: runner.os == 'macos' run: | - brew install docker docker-compose + brew install docker # Using mount-type 9p to allow the containers launched via docker-compose to chown # https://github.com/abiosoft/colima/issues/54#issuecomment-1250217077 diff --git a/autobahn-tests/build.gradle.kts b/autobahn-tests/build.gradle.kts index 7443d1b19..b01f52e6a 100644 --- a/autobahn-tests/build.gradle.kts +++ b/autobahn-tests/build.gradle.kts @@ -153,9 +153,6 @@ configurations.configureEach { dockerCompose { useComposeFiles.set(listOf(file("$projectDir/test-server/docker-compose.yml").toString())) buildBeforeUp.set(false) - - // Can't use v2 right now, see https://github.com/avast/gradle-docker-compose-plugin/issues/414 - useDockerComposeV2.set(false) } // ensure autobahn test server is launched for websocket tests diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b892cca52..f47369dbe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ vyarus-github-info = { id = "ru.vyarus.github-info", version.ref = "vyarus-githu [versions] -avast-docker-compose-plugin = "0.17.2" +avast-docker-compose-plugin = "0.17.4" binary-compatibility-validator-plugin = "0.13.2" complete-kotlin-plugin = "1.1.0" dokka = "1.8.20"