diff --git a/.travis.yml b/.travis.yml index a690f9f2..85aaa0c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,9 +29,16 @@ script: - if [ -n "$TRAVIS_TAG" ]; then wget -O jdk-windows-64.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip; wget -O jdk-windows-32.zip https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.252-2.b09-x86/java-1.8.0-openjdk-1.8.0.252-2.b09.ojdkbuild.windows.x86.zip; + wget -O butler.zip https://broth.itch.ovh/butler/linux-amd64/LATEST/archive/default; + unzip butler.zip + # GNU unzip tends to not set the executable bit even though it's set in the .zip + chmod +x butler + # just a sanity check run (and also helpful in case you're sharing CI logs) + ./butler -V ./gradlew desktop:packrWindows32; ./gradlew desktop:packrWindows64; + ./butler push deploy/Unciv-Windows64.zip yairm210/unciv:Windows64 ./gradlew desktop:packrLinux32; ./gradlew desktop:packrLinux64; ./gradlew desktop:zipLinuxFilesForJar; diff --git a/tests/src/com/unciv/testing/BasicTests.kt b/tests/src/com/unciv/testing/BasicTests.kt index 1d05e346..cc305ff6 100644 --- a/tests/src/com/unciv/testing/BasicTests.kt +++ b/tests/src/com/unciv/testing/BasicTests.kt @@ -78,12 +78,6 @@ class BasicTests { UncivGame.Current.settings = GameSettings().apply { language = "Italian" } } -// @Test // This should NOT run as part of the test suite! -// fun tryUnzip(){ -// Zip.extractFolder("""C:\Users\LENOVO\Downloads\Rebuild.rar""") -// Zip.downloadAndExtract("/Mods/Reasoures.zip", FileHandle("""C:\Users\LENOVO\Downloads""")) -// Zip.downloadAndExtract("https://github.com/yairm210/Unciv-IV-mod/archive/master.zip", FileHandle("""C:\Users\LENOVO\Downloads""")) -// } // @Test // This should NOT run as part of the test suite! // fun tryGetGithubTopicInfo(){