From d270574e26ea5e39241c92b5110d0f0f5f794546 Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 15:15:05 +0100 Subject: [PATCH 1/6] ci: fix? --- .woodpecker.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5691249..3a61ee4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,17 +1,11 @@ -pipeline: - clone: - git: - image: woodpeckerci/plugin-git +clone: + git: + image: woodpeckerci/plugin-git:latest settings: - - path: MagicStorageVoidBag - when: - branch: [ main, ci-testing ] + path: MagicStorageVoidBag +pipeline: build: - image: mcr.microsoft.com/dotnet/sdk + image: mcr.microsoft.com/dotnet/sdk:latest commands: - ls - when: - branch: [ main, ci-testing ] - -branches: [ main, ci-testing ] \ No newline at end of file From 547993ad509fe30b3076252df3e3107d431826b9 Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 17:17:43 +0100 Subject: [PATCH 2/6] ci: fetch some deps --- .woodpecker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3a61ee4..bea12e6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,6 +5,13 @@ clone: path: MagicStorageVoidBag pipeline: + fetch-deps: + image: alpine/git:latest + commands: + - git clone https://github.com/blushiemagic/MagicStorage.git + - wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip + - unzip tModLoader.zip -d tModLoader + - rm tModLoader.zip build: image: mcr.microsoft.com/dotnet/sdk:latest commands: From ed4ab8f07d75c7913ce2fc32bcb32a27180ba573 Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 17:50:27 +0100 Subject: [PATCH 3/6] ci: fix some dll references --- MagicStorageVoidBag.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MagicStorageVoidBag.csproj b/MagicStorageVoidBag.csproj index e31521e..4f1d66d 100644 --- a/MagicStorageVoidBag.csproj +++ b/MagicStorageVoidBag.csproj @@ -12,10 +12,10 @@ - ../Mod Libraries/MagicStorage.dll + ../MagicStorage/MagicStorage.dll - lib\MagicStorageHooks.dll + lib/MagicStorageHooks.dll \ No newline at end of file From 13e8f9a8b87e4845bd3070333c76eb7dd66e3225 Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 17:55:45 +0100 Subject: [PATCH 4/6] ci: build things --- .woodpecker.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index bea12e6..37c8253 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,9 +10,26 @@ pipeline: commands: - git clone https://github.com/blushiemagic/MagicStorage.git - wget https://github.com/tModLoader/tModLoader/releases/latest/download/tModLoader.zip - - unzip tModLoader.zip -d tModLoader + - 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 + - > + echo " + + " > tModLoader.targets + build: - image: mcr.microsoft.com/dotnet/sdk:latest + image: jackbondpreston/fna-alpine commands: + - | + echo "Shell: $SHELL" + echo "CI_WORKSPACE: $CI_WORKSPACE" + - cat tModLoader.targets + - cd MagicStorage && dotnet build -c Release || true + - cp bin/Release/net6.0/MagicStorage.dll . + - cd $CI_WORKSPACE + - cd MagicStorageVoidBag && dotnet build -c Release || true + - cp bin/Release/net6.0/MagicStorageVoidBag.dll . + - cd $CI_WORKSPACE + - cp ~/.local/share/Terraria/tModLoader/Mods/*.tmod . - ls From 68033424ec932096a232d27e4ea7ee2333eb36eb Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 22:35:31 +0100 Subject: [PATCH 5/6] ci: release things --- .woodpecker.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 37c8253..f04c506 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -31,5 +31,17 @@ pipeline: - cd MagicStorageVoidBag && dotnet build -c Release || true - cp bin/Release/net6.0/MagicStorageVoidBag.dll . - cd $CI_WORKSPACE - - cp ~/.local/share/Terraria/tModLoader/Mods/*.tmod . - - ls + - mkdir release + - cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/ + - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/ + - ls release + + 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 From 02be4b41cc9bb36d35eb807957225b5d539b46fd Mon Sep 17 00:00:00 2001 From: Jack Bond-Preston Date: Thu, 7 Jul 2022 22:41:05 +0100 Subject: [PATCH 6/6] ci: only run on tags --- .woodpecker.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index f04c506..1a814c2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,6 +3,8 @@ clone: image: woodpeckerci/plugin-git:latest settings: path: MagicStorageVoidBag + when: + event: tag pipeline: fetch-deps: @@ -17,6 +19,8 @@ pipeline: echo " " > tModLoader.targets + when: + event: tag build: image: jackbondpreston/fna-alpine @@ -35,6 +39,8 @@ pipeline: - cp ~/.local/share/Terraria/tModLoader/Mods/MagicStorageVoidBag.tmod release/ - cp MagicStorageVoidBag/MagicStorageVoidBag.dll release/ - ls release + when: + event: tag gitea-release: image: plugins/gitea-release