diff --git a/.travis.yml b/.travis.yml index 7f8d606..2347be6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,47 +1,52 @@ language: python +os: linux dist: xenial addons: apt: update: true packages: - - xvfb - - libzip-dev -services: -- xvfb + - libzip-dev before_install: -- pip install hererocks -- hererocks env --luarocks 3.0 --lua latest -- export 'PATH='"$TRAVIS_BUILD_DIR"'/env/bin'":$PATH" -- luarocks install --server="http://luarocks.org/dev" lua-zip -- luarocks install love-release -install: -- sudo add-apt-repository -y ppa:bartbes/love-stable -- sudo apt-get -q update -- sudo apt-get -y install love + - | + if ! [ -x "$(command -v luarocks)" ]; then + # install luarocks via hererocks via python + pip install hererocks + hererocks --lua 5.1 --luarocks 3 $HOME/luarocks + bash $HOME/luarocks/bin/activate + fi + export PATH=$HOME/luarocks/bin:$PATH +install: + - luarocks install --server="http://luarocks.org/dev" lua-zip + - luarocks install love-release + - sudo add-apt-repository -y ppa:bartbes/love-stable + - sudo apt-get -q update + - sudo apt-get -y install love +cache: + directories: + - $HOME/luarocks script: -- cd src -- love-release -W -M -- cd - -- mv pre-edited-cs "Cave Story" -- cd src/releases; dir -- zip -ur CaveStoryRandomizer-win64.zip "../../Cave Story" -- zip -ur CaveStoryRandomizer-win32.zip "../../Cave Story" -- zip -ur CaveStoryRandomizer-macosx.zip "../../Cave Story" -- zip -r CaveStoryRandomizer-linux.zip CaveStoryRandomizer.love "../../Cave Story" -- cd - -- chmod u+r+x daily.sh -- "./daily.sh" + - bash daily.sh env: global: - secure: DU2Mq4FPbOidv0Go4b+2r5Vy7v0bbQo40ZZPkiwm/6nAJYkwySwVn2DyZGwh/kV4o6ZG0IgtLxPvHiF8lVZptbtkHJTt/GeokwwvsfpHJntPC9jyvXklFkkln9h2AgWrhTmFf+EYE4Mlm7FAjsr/9ZZHCuGn7wDCOBk3g4Zy7eAyKGqpYMN3296eUiZPXWtOAexmbavFI07pmu4ZyJ8K6HMmjd8YSAQpui3zJn/hMTupQm+o5s/ehZ72QnUyjRWdKvLlJCzORrajJxgYXQqLdjXVMcq4kuR4pDRnLdW9XBlAWiHOvj7wlVOUyBq2ZyhkTTNEYiQp+9UsIua1gG0hdLiOGH2ODtrb6NvQIRUfs5jE6xHmw3hQCfIe9itT+SbVQmuuTovM/MQTS/vH7k+AHtnJCGykMjAD6evNi1EkOG5oxrL7xEGPz7lzyVISoz0O4YmMWGF0qIzb68R11+Eo1URFrEUDxZc7F2kMoeAbnTxfiGABrMXrgIN7ReJhfD1z4ik6KwKBFw9AwJfldyb5w0QgqFAkkihqKGp5VbTMR6LeSN0Tq/Ic3QRvLHYt43+eoRXS4d2lvSo/0Nf7FftQPurbLI6c/r9nckwOZmjFicwYJ0Ulrbd46og74FUQZFSMcrVsiXo1PG2yTwu9bUvTBUHWdWh0o2xPpfAHbA05++c= +before_deploy: + - | + cd src; love-release -M; cd - + bash reshacker.sh + mv pre-edited-cs "src/releases/Cave Story" + cd src/releases + zip -9 -qur CaveStoryRandomizer-macos.zip "Cave Story" + zip -9 -qr CaveStoryRandomizer-linux.zip "Cave Story" CaveStoryRandomizer.love + cd - + # don't forget to create the windows releases! deploy: provider: releases - api_key: + token: secure: bMinTly2BOZCNQw625Fz744hvVQlnwZiC6pQZZx1f5evs0gi4TXbqqft5UN3orGgRiNnVnbf2qYC7PnS1LzynHUimdVk8iqfRKz4ADuWXyf9/i1gojzzSAI87lxbGaHxzqjZLtzf1zRonPlY1oj9X3a1eAle6EEAn/Utnm/jqZPhTYm8cMowLWqcVTcDOw1lhBpgsVYdej1wCaq7r2KBDvrqWZCdt8pJ2lcaShJEqmBONDvu9KO+gbNXwmhBAz4bG0DTVFhO459ZNjfNz749eiU7KhbxvFgz7O+j8HEdhlXznYgmzveUmVmhOSe3z037YwCNv+2ar0FITGkmTpgog0z2XuxDMb28Eakoc0uzaowwB68JRfEeRpBGidhSGraZ5DnHOS3QdDaEQ4jImv97DagiVoqcKm3JDGhGuvbI4dfPsXHKMncJC8cqf86NwSg63boabcoUTwzVLZdd4tbiOBqYPBgEtEz4uFgKvkrrzE0DoP1Efi1aZqcnOW6xckHbC261rxB5QG8WGcb1tDnmQgbhbEEguPHuzKBWP6ktpjpFdeS3Wbqb0UMaXQXMCcaMpJfCLNsLxQ6iHOh+XQhJREDPTuXm4F1m0BzSjBvQpWQ4tpO+kF1KiJ4wiwzn9jTfJxhgMgxEoY75dtH+E0K2jXLRezychR22V+7R9ifNLns= file: - - releases/*.zip + - src/releases/*.zip file_glob: true - on: - repo: cave-story-randomizer/cave-story-randomizer - branch: stable draft: true + skip_cleanup: true + on: + tags: true diff --git a/CaveStoryRandomizer.ico b/CaveStoryRandomizer.ico new file mode 100644 index 0000000..91347b2 Binary files /dev/null and b/CaveStoryRandomizer.ico differ diff --git a/daily.sh b/daily.sh index 86d1d51..e723afa 100644 --- a/daily.sh +++ b/daily.sh @@ -1,6 +1,8 @@ set -ev if [ "$TRAVIS_EVENT_TYPE" != "cron" ]; then exit 0; fi -sudo xvfb-run --server-args="-screen 0 1024x768x24" love "releases/CaveStoryRandomizer.love" --daily +cd src +love-release +love "releases/CaveStoryRandomizer.love" --daily --headless cat daily.txt curl -H "Content-Type: application/json" -X POST -d @daily.txt "$WEBHOOK" \ No newline at end of file diff --git a/src/conf.lua b/src/conf.lua index 8fd659c..2b9a962 100644 --- a/src/conf.lua +++ b/src/conf.lua @@ -24,6 +24,12 @@ function love.conf(t) t.modules.touch = false t.modules.video = false + for _,a in pairs(arg) do + if a == "--headless" then + t.window, t.modules.window, t.modules.graphics = false, false, false + end + end + t.releases = { -- This is the name of the zip archive which contains your game. title = 'CaveStoryRandomizer', diff --git a/src/main.lua b/src/main.lua index bfd5f89..3c2c116 100644 --- a/src/main.lua +++ b/src/main.lua @@ -27,7 +27,6 @@ function love.load(args) Settings:init() if _.contains(args, "--daily") then - love.window.close() U.writeFile("daily.txt", generateDaily()) love.event.quit() return