Skip to content

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

Merge branch 'master' into another

parents 36892005 a54e72cc
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 17 deletions
.gitignore
View file @ d83e33c3
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
/Magic* /Magic*
/pics /pics
/Printer /Printer
/script
/ygopro-* /ygopro-*
/*-Cards /*-Cards
......
.travis.yml
View file @ d83e33c3
...@@ -81,10 +81,10 @@ script: ...@@ -81,10 +81,10 @@ script:
before_deploy: before_deploy:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
zip -q -r KoishiPro-$TRAVIS_OS_NAME.zip ygopro libirrKlang.so; zip -q -r KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro libirrKlang.so;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
zip -q -r KoishiPro-$TRAVIS_OS_NAME.zip ygopro.app; zip -q -r KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip ygopro.app;
fi fi
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/HuangYuNan/ygopro222-images/archive/master.zip - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name https://github.com/HuangYuNan/ygopro222-images/archive/master.zip
...@@ -104,20 +104,20 @@ before_deploy: ...@@ -104,20 +104,20 @@ before_deploy:
- rm -rf pics/thumbnail pics/*.db - rm -rf pics/thumbnail pics/*.db
- mkdir replay - mkdir replay
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
zip -q -r KoishiPro-$TRAVIS_OS_NAME-full.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay; zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound; zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound-$TRAVIS_TAG.zip ygopro libirrKlang.so LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
zip -q -r KoishiPro-$TRAVIS_OS_NAME-full.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay; zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay;
zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound; zip -q -r KoishiPro-$TRAVIS_OS_NAME-full-with-sound-$TRAVIS_TAG.zip ygopro.app LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics replay sound;
fi fi
deploy: deploy:
provider: releases provider: releases
file: file:
- KoishiPro-$TRAVIS_OS_NAME.zip - KoishiPro-$TRAVIS_OS_NAME-$TRAVIS_TAG.zip
- KoishiPro-$TRAVIS_OS_NAME-full.zip - KoishiPro-$TRAVIS_OS_NAME-full-$TRAVIS_TAG.zip
- KoishiPro-$TRAVIS_OS_NAME-full-with-sound.zip - KoishiPro-$TRAVIS_OS_NAME-full-with-sound-$TRAVIS_TAG.zip
skip_cleanup: true skip_cleanup: true
overwrite: true overwrite: true
on: on:
......
appveyor.yml
View file @ d83e33c3
...@@ -87,9 +87,9 @@ after_build: ...@@ -87,9 +87,9 @@ after_build:
- rm -rf pics/thumbnail pics/*.db - rm -rf pics/thumbnail pics/*.db
- mkdir replay - mkdir replay
- 7z a -mx9 -xr!.git* KoishiPro.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics update-koishipro replay WindBot Bot.exe bot.conf - 7z a -mx9 -xr!.git* KoishiPro-%APPVEYOR_REPO_TAG_NAME%.7z ygopro.exe LICENSE README.md lflist.conf strings.conf system.conf cards.cdb script textures deck single pics update-koishipro replay WindBot Bot.exe bot.conf
- cp -rf KoishiPro.7z KoishiPro-with-sound.7z - cp -rf KoishiPro-%APPVEYOR_REPO_TAG_NAME%.7z KoishiPro-with-sound-%APPVEYOR_REPO_TAG_NAME%.7z
- 7z a -mx9 -xr!.git* KoishiPro-with-sound.7z sound - 7z a -mx9 -xr!.git* KoishiPro-with-sound-%APPVEYOR_REPO_TAG_NAME%.7z sound
test: off test: off
...@@ -104,9 +104,9 @@ deploy: ...@@ -104,9 +104,9 @@ deploy:
artifacts: artifacts:
- path: ygopro.exe - path: ygopro.exe
name: ygopro client name: ygopro client
- path: KoishiPro.7z - path: KoishiPro-$(APPVEYOR_REPO_TAG_NAME).7z
name: ygopro full repack name: ygopro full repack
- path: KoishiPro-with-sound.7z - path: KoishiPro-with-sound-$(APPVEYOR_REPO_TAG_NAME).7z
name: ygopro full repack with sound name: ygopro full repack with sound
cache: cache:
...@@ -116,4 +116,3 @@ cache: ...@@ -116,4 +116,3 @@ cache:
- irrlicht-1.8.4.zip - irrlicht-1.8.4.zip
- lua-5.3.4.tar.gz - lua-5.3.4.tar.gz
- sqlite-amalgamation-3210000.zip - sqlite-amalgamation-3210000.zip
- Redis-x64-3.2.100.zip
cards.cdb
View file @ d83e33c3
No preview for this file type
script @ b13d590d
Subproject commit 16e9c91149de2fd5137666b303909ee75d87d2b1 Subproject commit b13d590da37333c0cb81d978c7c0650d77adc8df
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