diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca028812..d9202a04 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 @@ -67,9 +67,11 @@ jobs: cache-to: type=gha,mode=max - name: Run tests - if: github.ref_name == 'master' + if: github.ref_name == 'java8' 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 1638b74b..00000000 --- a/tests/docker-compose.test.yml +++ /dev/null @@ -1,14 +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" - 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}