From cc61497f7e5b30d4442aff6afdda1c10c5b09ed9 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 6 Dec 2021 22:15:32 -0600 Subject: [PATCH] build: test 1.12.2 with java8 --- .github/workflows/main.yml | 4 +++- tests/docker-compose.test.yml | 15 --------------- tests/docker-compose.yml | 1 + 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 tests/docker-compose.test.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca028812..86f6a8bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: - name: Build for test uses: docker/build-push-action@v2.7.0 - if: github.ref_name == 'master' + if: github.ref_name == 'java8' with: context: . platforms: linux/amd64 @@ -70,6 +70,8 @@ jobs: if: github.ref_name == 'master' run: | tests/test.sh + env: + MINECRAFT_VERSION: 1.12.2 - name: Build and push id: docker_build diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml deleted file mode 100644 index 8a6ccd0a..00000000 --- a/tests/docker-compose.test.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: "3.8" - -services: - monitor: - depends_on: - - mc - image: itzg/mc-monitor:${MC_MONITOR_VERSION:-0.10.4} - command: --debug status --host mc --retry-interval 1s --retry-limit 240 - mc: - restart: "no" - image: ${IMAGE_TO_TEST:-itzg/minecraft-server} - environment: - EULA: "TRUE" - VERSION: "1.16.5" - diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 63b75fc0..f3a0bb0a 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -11,4 +11,5 @@ services: image: ${IMAGE_TO_TEST:-itzg/minecraft-server} environment: EULA: "TRUE" + VERSION: ${MINECRAFT_VERSION:-LATEST}