mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-04-03 04:08:52 +00:00
Adding ForgeAPI version pinning and dependency download. (#1308)
Co-authored-by: christopher blodgett <christopher.blodgett@gmail.com> Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>
This commit is contained in:
@@ -8,10 +8,11 @@ services:
|
||||
EULA: "TRUE"
|
||||
SETUP_ONLY: "TRUE"
|
||||
VERSION: ${MINECRAFT_VERSION:-LATEST}
|
||||
MODS_FORGEAPI_FILE: /config/example.json
|
||||
MODS_FORGEAPI_FILE: /config/forgeapi_mods.json
|
||||
# Key is defined in .github/workflows/pr.yml and ci.yml
|
||||
# This should be coming from github secrets.
|
||||
MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
|
||||
REMOVE_OLD_FORGEAPI_MODS: "TRUE"
|
||||
MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "FALSE"
|
||||
volumes:
|
||||
- ./example.json:/config/example.json:ro
|
||||
- ./forgeapi_mods.json:/config/forgeapi_mods.json:ro
|
||||
@@ -7,5 +7,11 @@
|
||||
"name": "Fabric Voice Mod",
|
||||
"projectId": "416089",
|
||||
"releaseType": "beta"
|
||||
},
|
||||
{
|
||||
"name": "Biomes o plenty",
|
||||
"projectId": "220318",
|
||||
"fileName": "BiomesOPlenty-1.18.1-15.0.0.100-universal.jar",
|
||||
"releaseType": "release"
|
||||
}
|
||||
]
|
||||
1
tests/setuponlytests/forgeapimods_file/require.sh
Normal file
1
tests/setuponlytests/forgeapimods_file/require.sh
Normal file
@@ -0,0 +1 @@
|
||||
[[ $MODS_FORGEAPI_KEY ]] || exit 1
|
||||
@@ -8,7 +8,8 @@ services:
|
||||
EULA: "TRUE"
|
||||
SETUP_ONLY: "TRUE"
|
||||
VERSION: ${MINECRAFT_VERSION:-LATEST}
|
||||
MODS_FORGEAPI_PROJECTIDS: 306612,416089
|
||||
MODS_FORGEAPI_DOWNLOAD_DEPENDENCIES: "TRUE"
|
||||
MODS_FORGEAPI_PROJECTIDS: 306612,416089,220318
|
||||
# Allows for Beta releases of 416089 the Fabric Voice Mod
|
||||
MODS_FORGEAPI_RELEASES: BETA
|
||||
MODS_FORGEAPI_KEY: ${MODS_FORGEAPI_KEY}
|
||||
1
tests/setuponlytests/forgeapimods_projectids/require.sh
Normal file
1
tests/setuponlytests/forgeapimods_projectids/require.sh
Normal file
@@ -0,0 +1 @@
|
||||
[[ $MODS_FORGEAPI_KEY ]] || exit 1
|
||||
@@ -11,6 +11,17 @@ setupOnlyMinecraftTest(){
|
||||
cd "$folder"
|
||||
result=0
|
||||
|
||||
if [ -f require.sh ]; then
|
||||
# require.sh scripts can check for environment variables, etc that are required for the test.
|
||||
# The script should exit with a non-zero status to indicate the test requirements are missing
|
||||
# and the test should be skipped
|
||||
if ! bash require.sh; then
|
||||
echo "${folder} SKIP"
|
||||
cd ..
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! logs=$(docker-compose run mc 2>&1); then
|
||||
echo "${folder} test scenario FAILED"
|
||||
echo ":::::::::::: LOGS ::::::::::::::::
|
||||
|
||||
Reference in New Issue
Block a user