Skip to content

Commit

Permalink
ci testing overhaul
Browse files Browse the repository at this point in the history
  • Loading branch information
BuckarooBanzay committed Jan 8, 2024
1 parent 8264761 commit ba960a8
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
12 changes: 11 additions & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
ENGINE_VERSION: [5.3.0, 5.6.1, latest]
include:
- ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.5.0
MTG_VERSION: "5.5.0"
- ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.6.0
MTG_VERSION: "5.6.0"
- ENGINE_IMAGE: registry.gitlab.com/minetest/minetest/server:5.7.0
MTG_VERSION: "5.7.0"
- ENGINE_IMAGE: ghcr.io/minetest-hosting/minetest-docker:5.8.0
MTG_VERSION: "5.8.0"
- ENGINE_IMAGE: ghcr.io/minetest-hosting/minetest-docker:main
MTG_VERSION: master

steps:
- uses: actions/checkout@v2
Expand Down
11 changes: 8 additions & 3 deletions .test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
ARG ENGINE_VERSION=5.5.0
FROM registry.gitlab.com/minetest/minetest/server:${ENGINE_VERSION}
ARG ENGINE_IMAGE=ghcr.io/minetest-hosting/minetest-docker:5.8.0

FROM ${ENGINE_IMAGE}
ARG MTG_VERSION=master
USER root
RUN apk add git &&\
mkdir -p /root/.minetest/worlds/world/worldmods/ &&\
cd /root/.minetest/worlds/world/worldmods/ &&\
git clone --depth 1 https://github.com/BuckarooBanzay/mtt &&\
git clone --recurse-submodules --depth 1 https://github.com/mt-mods/basic_materials.git &&\
git clone --depth 1 https://github.com/mt-mods/pipeworks.git &&\
git clone --depth 1 https://github.com/minetest-mods/moreores.git
git clone --depth 1 https://github.com/minetest-mods/moreores.git &&\
mkdir /root/.minetest/games &&\
git clone https://github.com/minetest/minetest_game.git /root/.minetest/games/minetest &&\
cd /root/.minetest/games/minetest &&\
git checkout ${MTG_VERSION}
1 change: 0 additions & 1 deletion .test/minetest.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
default_game = minetest_game
mg_name = v7
mtt_enable = true
deprecated_lua_api_handling = error
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ services:
build:
context: ./.test
args:
ENGINE_VERSION: ${ENGINE_VERSION:-5.5.0}
entrypoint: "minetestserver --config /minetest.conf"
ENGINE_IMAGE: ${ENGINE_IMAGE:-ghcr.io/minetest-hosting/minetest-docker:5.8.0}
MTG_VERSION: ${MTG_VERSION:-5.8.0}
entrypoint: "minetestserver --config /minetest.conf --gameid minetest"
user: root
volumes:
- "./:/root/.minetest/worlds/world/worldmods/technic/"
Expand Down
2 changes: 1 addition & 1 deletion modpack.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name = technic
description = The technic modpack extends the Minetest game with many new elements, mainly constructable machines and tools. It is a large modpack, and tends to dominate gameplay when it is used.
min_minetest_version = 5.0
min_minetest_version = 5.5

0 comments on commit ba960a8

Please sign in to comment.