Skip to content

Y
ygopro
Commit 00d6623c authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into another

parents b31704b4 c43f0650
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
.travis.yml
View file @ 00d6623c
...@@ -104,7 +104,7 @@ before_deploy: ...@@ -104,7 +104,7 @@ before_deploy:
- 7z x -y WindBot.7z > /dev/null - 7z x -y WindBot.7z > /dev/null
- mv -f WindBot windbot - mv -f WindBot windbot
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/windbot/raw/master/BotWrapper/BotWrapper.sh - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/windbot/raw/master/BotWrapper/BotWrapper.sh
- mv -f BotWrapper.sh bot.sh - mv -f BotWrapper.sh bot
- cd sound - cd sound
- bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-data/raw/master/sound/{} ; exit 0" - bash -c "grep '.wav' files.txt | xargs -I {} curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/purerosefallen/ygopro-222DIY-data/raw/master/sound/{} ; exit 0"
...@@ -112,11 +112,11 @@ before_deploy: ...@@ -112,11 +112,11 @@ before_deploy:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sed -i "s/c:\/windows/./g" ./system.conf; sed -i "s/c:\/windows/./g" ./system.conf;
7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro libIrrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot bot.conf bot.sh > /dev/null; 7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro libIrrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot bot.conf bot > /dev/null;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
sed -i "" "s/c:\/windows/./g" ./system.conf; sed -i "" "s/c:\/windows/./g" ./system.conf;
7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot bot.conf bot.sh > /dev/null; 7z a -mx9 -xr!.git* KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures fonts skin deck single pics sound windbot bot.conf bot > /dev/null;
fi fi
deploy: deploy:
......
ocgcore @ 76f9681d
Subproject commit 6e38611e5b072daf90e0801d3b99005d5a4f8ee4 Subproject commit 76f9681d300124f9a44d995578dc38994007f9dc
script @ 4a28466e
Subproject commit 94dab4b22bed55238d5f0724a809edd04fbedba9 Subproject commit 4a28466eba8b749a0a800e65b0a6a9dfa6aad700
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment