4 Commits
Author SHA1 Message Date
Oliver Hamlet 70371b7647 Deploy tagged builds to GitHub 2016-12-15 20:45:38 +00:00
Oliver Hamlet f5cfa7cc0f Delete old Bintray versions on successful CI run 2016-12-15 20:44:55 +00:00
Oliver Hamlet cf391b0da0 Update to LOOT API v0.10.2 and remove Linux builds
Support for Linux builds is removed as LOOT's snapshot builds are no
longer reliably available, and Linux builds aren't published as part of
LOOT releases. Linux builds could easily be reinstated if LOOT API
binaries become reliably available again.
2016-12-15 20:38:44 +00:00
Oliver Hamlet 58dd19af7d Update Bintray API token used
The previous token was leaked and has been invalidated.
2016-12-05 23:06:46 +00:00
7 changed files with 32 additions and 77 deletions
-47
View File
@@ -1,47 +0,0 @@
sudo: false
language: cpp
compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test # ppa:ubuntu-toolchain-r/test
packages:
- gcc-5
- g++-5
- wget
install:
# Use GCC 5.
- if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
# Download CMake binary because those available in PPAs either don't support
# xz downloads or don't support HTTPS.
- wget https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz
- tar -xf cmake-3.6.2-Linux-x86_64.tar.gz
before_script:
# Move into the cloned LOOT repo build path.
- mkdir build && cd build
# Link dynamically to the C++ standard library runtime.
- ../cmake-3.6.2-Linux-x86_64/bin/cmake ..
script:
- make all
- python -m unittest test
after_success:
- ../cmake-3.6.2-Linux-x86_64/bin/cpack -C Release
- cd $TRAVIS_BUILD_DIR
# Need to replace the Bintray config files' version placeholders.
- VERSION=$(ls build/package/loot_api_python-*.tar.xz | sed 's/build\/package\/loot_api_python-//;s/-Linux.tar.xz//;')
- sed -i "s/REPLACE_THIS_VERSION/${VERSION}/" scripts/travis/loot-api.bintray.json
deploy:
- provider: bintray
file: scripts/travis/loot-api.bintray.json
user: wrinklyninja
key:
secure: "XUj1hk5lNhyzPNs3iv1kw8h370QrS+hOcGvj7fMkMb3KQF+I7XJIIhi5lcVd/X5NB79M4IYKac+7n4fVPsf6jXd+SpKYKdPF5ZnSn00dtU34Jhz+DiZQoLdAVLhGgOTLxv2SE6kfvfCXXVlSSoVOVNH0rx0OWE/BjZaSxd9+XeQgEJ/qozvt9kl4sd02y/M4r9h4SAMGf3zav+PWy+5cigy/LFONDQ9oeCEOJmVbazlB2Hkt0GnRkPpW/jFjUvt5qs0jS1neBBmeVCxvue1qJVJBwPtIszNhoARn/mY1tfQ4b0MdzvYhK1kjHvtBLW+OoXOr5VaiZ2a0J+t7jtgfO2cadiIgqCbxddltq1CESFa3pSCpkAfSg1jkl3Lj7BJzSLrRLxySN+Hq0O4qR3A3cQOVt5glZIbabq0h1b9jxZSpU9D+jwgZxxmI8NZJRS4TegZ+Q1ygY/MrSydUWQ3fK0ls20GePKjPtK90ipqt0HLyjAcLLVshc1jB3MPqDKEPXnQtxrJmbHwZu2rzlngIjUNybJXQxuJLqcE/awijpoftbqxctXzEq2hMj/lp6Y4agX++hikPg+BP6HHCwuwgXTYkcUXC6v5Mm2NTboDnimiJq2aCzcgc4RVjes1o5cKng8xtpYCNoTkEd4Tu1DL+AR6tJnjXkvRsJCdBWUVIFG4="
skip_cleanup: true
on:
all_branches: true
+1 -6
View File
@@ -48,15 +48,10 @@ add_subdirectory(${PYBIND11_EXTRACTED_PATH})
# LOOT API # LOOT API
####################################### #######################################
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.7z")
else()
set(LOOT_API_URL "https://bintray.com/wrinklyninja/loot/download_file?file_path=loot-api_0.10.1-0-gd8f8dc4_master.tar.xz")
endif()
ExternalProject_Add(loot-api-c++ ExternalProject_Add(loot-api-c++
PREFIX "external" PREFIX "external"
URL ${LOOT_API_URL} URL "https://github.com/loot/loot/releases/download/0.10.2/loot-api_0.10.2-0-g9eb7d26_dev.7z"
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""
INSTALL_COMMAND "") INSTALL_COMMAND "")
+23 -1
View File
@@ -4,6 +4,13 @@ version: "{build}-{branch}"
configuration: Release configuration: Release
environment:
bintray_auth_token:
secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
install:
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.1.0/delete_old_bintray_versions.py', "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py")
before_build: before_build:
- cd %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER%
- ps: mkdir build - ps: mkdir build
@@ -33,10 +40,25 @@ deploy:
- provider: BinTray - provider: BinTray
username: wrinklyninja username: wrinklyninja
api_key: api_key:
secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
subject: wrinklyninja subject: wrinklyninja
repo: loot repo: loot
package: loot-api-python package: loot-api-python
version: $(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH) version: $(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)
publish: true publish: true
artifact: loot_api_python artifact: loot_api_python
- provider: GitHub
tag: $(APPVEYOR_REPO_TAG_NAME)
release: LOOT API Python Module v$(APPVEYOR_REPO_TAG_NAME)
description: |
Requires Windows 7 or later and the [MSVC 2015 x86 redistributable](https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
auth_token:
secure: V1GojGQfrAiQtUWtNNXfm3samiH+1yNF5UYhkn8B8mbif20IGTGWNlBS9E4S0SUC
artifact: loot_api_python
draft: false
on:
appveyor_repo_tag: true
on_success:
- ps: python "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py" -o loot -g loot-api-python -u wrinklyninja -b loot -p loot-api-python -t $env:bintray_auth_token -n 30
+1 -1
View File
@@ -346,5 +346,5 @@ texinfo_documents = [
# Example configuration for intersphinx: refer to the Python standard library. # Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = { intersphinx_mapping = {
'loot_api': ('http://loot.readthedocs.io/en/0.10.1/', None), 'loot_api': ('http://loot.readthedocs.io/en/0.10.2/', None),
} }
-15
View File
@@ -1,15 +0,0 @@
{
"package": {
"name": "loot-api-python",
"repo": "loot",
"subject": "wrinklyninja"
},
"version": {
"name": "REPLACE_THIS_VERSION"
},
"files": [{
"includePattern": "build/package/(loot_api_python-.+\\.tar.xz)",
"uploadPattern": "$1"
}],
"publish": true
}
+5 -5
View File
@@ -38,17 +38,17 @@ class TestLootApi(GameFixture):
def test_version(self): def test_version(self):
self.assertEqual(Version.major, 0) self.assertEqual(Version.major, 0)
self.assertEqual(Version.minor, 10) self.assertEqual(Version.minor, 10)
self.assertEqual(Version.patch, 1) self.assertEqual(Version.patch, 2)
self.assertNotEqual(Version.revision, u'') self.assertNotEqual(Version.revision, u'')
self.assertEqual(Version.string(), "0.10.1") self.assertEqual(Version.string(), "0.10.2")
def test_wrapper_version(self): def test_wrapper_version(self):
self.assertEqual(WrapperVersion.major, 1) self.assertEqual(WrapperVersion.major, 1)
self.assertEqual(WrapperVersion.minor, 1) self.assertEqual(WrapperVersion.minor, 2)
self.assertEqual(WrapperVersion.patch, 2) self.assertEqual(WrapperVersion.patch, 0)
self.assertNotEqual(WrapperVersion.revision, u'') self.assertNotEqual(WrapperVersion.revision, u'')
self.assertNotEqual(WrapperVersion.revision, Version.revision) self.assertNotEqual(WrapperVersion.revision, Version.revision)
self.assertEqual(WrapperVersion.string(), "1.1.2") self.assertEqual(WrapperVersion.string(), "1.2.0")
def test_create_db(self): def test_create_db(self):
db = create_database(GameType.tes4, self.game_path, self.local_path) db = create_database(GameType.tes4, self.game_path, self.local_path)
+2 -2
View File
@@ -26,8 +26,8 @@
namespace loot { namespace loot {
const unsigned int WrapperVersion::major = 1; const unsigned int WrapperVersion::major = 1;
const unsigned int WrapperVersion::minor = 1; const unsigned int WrapperVersion::minor = 2;
const unsigned int WrapperVersion::patch = 2; const unsigned int WrapperVersion::patch = 0;
const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@"; const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@";
std::string WrapperVersion::string() { std::string WrapperVersion::string() {