From fde4132c56197e6cc78c54fb5d0212b49d502946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Mon, 26 Aug 2019 09:13:57 +0000 Subject: [PATCH] Acyclic Graphs --- .gitlab-ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70ebbed..80a1c63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,8 @@ deploy:datapacks: - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER/world/datapacks" --delete --exclude bukkit - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload" + needs: + - build:datapacks only: refs: @@ -87,7 +89,8 @@ deploy:resourcepack: - cd resourcepack-out - SHASUM=$(sha1sum resourcepack.zip | awk '{ print $1 }') - ssh "$SERVER_HOST" sed -i "s/resource-pack-sha1=.*/resource-pack-sha1=$SHASUM/" "$WPD_FOLDER/server.properties" - + needs: + - build:resourcepack only: refs: - master @@ -111,6 +114,8 @@ pages: - resourcepack/**/* - resourcepack/* - .gitlab-ci.yml + needs: + - build:datapacks @@ -136,4 +141,7 @@ restart: changes: - resourcepack/**/* - resourcepack/* - - .gitlab-ci.yml \ No newline at end of file + - .gitlab-ci.yml + needs: + - deploy:resourcepack + - deploy:datapacks \ No newline at end of file