diff --git a/.woodpecker.yml b/.woodpecker.yml
index 94996b2..23d0425 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,64 +1,53 @@
-clone:
- git:
- image: woodpeckerci/plugin-git:latest
- settings:
- path: MagicStorageVoidBag
- when:
- event: tag
+when:
+ - event: [push, tag, manual]
-pipeline:
- fetch-deps:
+steps:
+ - name: fetch-deps
image: jackbondpreston/msvb-build-env
commands:
+ - export WORKDIR=`realpath "$CI_WORKSPACE/../"`
+ - cd $WORKDIR
- steamcmd "+login anonymous" "+workshop_download_item 1281930 2563309347" "+quit"
- wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip
- unzip -q tModLoader.zip -d tModLoader
- rm tModLoader.zip
- - ln -sf $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2-2.0.so.0 $CI_WORKSPACE/tModLoader/Libraries/Native/Linux/libSDL2.so
+ - ln -sf $WORKDIR/tModLoader/Libraries/Native/Linux/libSDL2-2.0.so.0 $WORKDIR/tModLoader/Libraries/Native/Linux/libSDL2.so
- >
echo "
-
+
" > tModLoader.targets
- |
- wget https://github.com/steviegt6/tml-patcher/releases/latest/download/TML.Patcher.zip
- unzip -q TML.Patcher.zip -d TMLPatcher
+ wget https://github.com/steviegt6/fnb/archive/refs/tags/0.1.0.zip
+ unzip -q 0.1.0.zip -d TMLPatcher
+ dotnet build --configuration=Release TMLPatcher/fnb-0.1.0/src/
- |
- rm -f /root/.steam/SteamApps/workshop/content/1281930/2563309347/workshop.json
+ sudo rm -f /root/.steam/SteamApps/workshop/content/1281930/2563309347/workshop.json
YEAR=$(ls /root/.steam/SteamApps/workshop/content/1281930/2563309347 | cut -c -4 | sort -nr | head -n 1)
VER=$(find /root/.steam/SteamApps/workshop/content/1281930/2563309347/ -type d -name "$YEAR.*" -printf "%f\n" | cut -c 6- | sort -nr | head -n 1)
cp /root/.steam/SteamApps/workshop/content/1281930/2563309347/$YEAR.$VER/MagicStorage.tmod ./
- - dotnet TMLPatcher/TML.Patcher.dll extract MagicStorage.tmod
- - cp MagicStorage/MagicStorage.dll $CI_WORKSPACE/
- when:
- event: tag
+ - dotnet TMLPatcher/fnb-0.1.0/src/Tomat.FNB/bin/Release/net8.0/fnb.dll tmod extract MagicStorage.tmod
+ - cp MagicStorage/MagicStorage.dll $WORKDIR
- build:
+ - name: build
image: jackbondpreston/msvb-build-env
commands:
- - |
- echo "Shell: $SHELL"
- echo "CI_WORKSPACE: $CI_WORKSPACE"
- - cat tModLoader.targets
- cd $CI_WORKSPACE
- - cd MagicStorageVoidBag
+ - cat ../tModLoader.targets
- rm -rf .git
- - dotnet build -c Release || true
- - cp bin/Release/net6.0/MagicStorageVoidBag.dll .
+ - dotnet build -c Release MagicStorageVoidBag.sln || true
+ - cp bin/Release/net8.0/MagicStorageVoidBag.dll .
- cd $CI_WORKSPACE
- mkdir release
- cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/
- - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/
+ - cp MagicStorageVoidBag.dll release/
- ls release
+
+ - name: gitea-release
when:
event: tag
-
- gitea-release:
image: plugins/gitea-release
settings:
api_key:
from_secret: gitea-api-key
base_url: https://git.jackbondpreston.me
files: release/*
- when:
- event: tag
-
diff --git a/MagicStorageVoidBag.csproj b/MagicStorageVoidBag.csproj
index 491a08c..706e50a 100644
--- a/MagicStorageVoidBag.csproj
+++ b/MagicStorageVoidBag.csproj
@@ -4,6 +4,9 @@
MagicStorageVoidBag
latest
+ net8.0
+ AnyCPU
+ true