diff --git a/.appveyor.yml b/.appveyor.yml index deb4bca4..aeb76e00 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,23 @@ version: 2.3.18-branch-{branch}-build-{build} + +# Skipping commits affecting specific files (GitHub only). More details here: https://www.appveyor.com/docs/appveyor-yml +skip_commits: + files: + - .github/* + - .travis/* + - .tx/* + - webclient/* + - .*ignore + - .gitlab-ci.yml + - .travis.yml + - '*.md' + image: Visual Studio 2015 + cache: - c:\protobuf-release - c:\zlib-release + environment: matrix: - qt_ver: 5.9\msvc2015_64 @@ -17,6 +32,7 @@ environment: cmake_generator: Visual Studio 14 2015 cmake_toolset: v140_xp # use the windows XP compatible toolset target_arch: x86 + install: - ps: | if (Test-Path c:\protobuf-release) { @@ -37,8 +53,10 @@ install: cmake . -G "$env:cmake_generator" -T "$env:cmake_toolset" -DCMAKE_INSTALL_PREFIX=c:/zlib-release msbuild INSTALL.vcxproj /p:Configuration=Release } + services: - mysql + build_script: - ps: | New-Item -ItemType directory -Path $env:APPVEYOR_BUILD_FOLDER\build @@ -59,15 +77,17 @@ build_script: (New-Object PSObject | Add-Member -PassThru NoteProperty bin $new_name | Add-Member -PassThru NoteProperty cmake $cmake_name | Add-Member -PassThru NoteProperty commit $env:APPVEYOR_REPO_COMMIT) | ConvertTo-JSON | Out-File -FilePath "latest-$env:target_arch" -Encoding ASCII Push-AppveyorArtifact "latest-$env:target_arch" $version = $matches['content'] + test: off + deploy: - description: "Dev build of Cockatrice" provider: GitHub auth_token: secure: p+7wPVry2XEa6TBm9XH8IaQZbBmXQ/J2ldbGmcIxUZD3NkkPrSRRlmE7Of1CBBIO + description: "Dev build of Cockatrice" artifact: /.*\.exe/ draft: false prerelease: true force_update: true on: - appveyor_repo_tag: true \ No newline at end of file + appveyor_repo_tag: true diff --git a/.dockerignore b/.dockerignore index 65c13ebf..075acd68 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,11 +1,9 @@ .git/ -CONTRIBUTING.md -Dockerfile -TODO.md build/ +.github/ +.travis/ +.tx/ cockatrice/ doc/ oracle/ -sounds/ -travis-compile.sh -travis-dependencies.sh +Dockerfile diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 11b4fb59..dfc469ec 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,8 +2,8 @@ ### Compatibility ### -Cockatrice is compiled on all platform using C++11, even if the majority of the -code is written in C++03. +Cockatrice is compiled on all platform using C++11, even if the majority of the +code is written in C++03. For consistency, use Qt data structures where possible, such as `QString` over `std::string` or `QList` over `std::vector`. diff --git a/.travis.yml b/.travis.yml index 7a296f67..c03db5a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,3 +56,5 @@ notifications: on_failure: change on_start: never +# official validator for travis.yml config files: https://yaml.travis-ci.org +# travis documentation: https://docs.travis-ci.com/user/customizing-the-build diff --git a/.tx/config b/.tx/config index 57a4f790..d5e37a00 100644 --- a/.tx/config +++ b/.tx/config @@ -10,4 +10,3 @@ source_lang = en file_filter = oracle/translations/oracle_.ts source_file = oracle/translations/oracle_en.ts source_lang = en - diff --git a/README.md b/README.md index ac7148e3..5e518c05 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ We offer downloads for all full releases (recommended) and the latest developmen - Latest full release (**recommended**): [![Download from GitHub Releases](https://img.shields.io/github/release/cockatrice/cockatrice.svg)](https://github.com/cockatrice/cockatrice/releases/latest) [![Download Count on Latest Release](https://img.shields.io/github/downloads/cockatrice/cockatrice/latest/total.svg)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice)
-- Latest development version: [![Download from GitHub Pre-Releases](https://img.shields.io/github/release/cockatrice/cockatrice/all.svg)](https://github.com/cockatrice/cockatrice/releases) +- Latest development version: [![Download from GitHub Pre-Releases](https://img.shields.io/github/release/cockatrice/cockatrice/all.svg)](https://github.com/cockatrice/cockatrice/releases) - Development builds may not be stable and/or contain several bugs. - If you'd like to be a Cockatrice Beta Tester, use this version. - More information can be [found here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)