Thinkoid-ified Travis, etc.
This commit is contained in:
parent
817b6b458f
commit
e861386990
|
@ -29,7 +29,7 @@ test: off
|
||||||
#- cmd: c:\cygwin\bin\bash ./tools/travis-ci/before_deploy.sh
|
#- cmd: c:\cygwin\bin\bash ./tools/travis-ci/before_deploy.sh
|
||||||
deploy:
|
deploy:
|
||||||
#release: openjpeg-$(appveyor_repo_tag_name)
|
#release: openjpeg-$(appveyor_repo_tag_name)
|
||||||
description: 'OpenJPEG $(appveyor_repo_tag_name) has been released. More info [here](https://github.com/uclouvain/openjpeg/blob/$(appveyor_repo_tag_name)/NEWS) and a detailed view [here](https://github.com/uclouvain/openjpeg/blob/$(appveyor_repo_tag_name)/CHANGES).'
|
description: 'OpenJPEG $(appveyor_repo_tag_name) has been released. More info [here](https://github.com/thinkoid/openjpeg/blob/$(appveyor_repo_tag_name)/NEWS) and a detailed view [here](https://github.com/thinkoid/openjpeg/blob/$(appveyor_repo_tag_name)/CHANGES).'
|
||||||
provider: GitHub
|
provider: GitHub
|
||||||
auth_token:
|
auth_token:
|
||||||
secure: XUL+IoRRw8U/4tupa/fMpinxurft7WRQHZiWHMLO5iuFbwZ+C3vCjVVVM+5Ebky7 # your encrypted token from GitHub
|
secure: XUL+IoRRw8U/4tupa/fMpinxurft7WRQHZiWHMLO5iuFbwZ+C3vCjVVVM+5Ebky7 # your encrypted token from GitHub
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
"Name": "openjpeg",
|
"Name": "openjpeg",
|
||||||
"Title": "OpenJPEG",
|
"Title": "OpenJPEG",
|
||||||
"SourceUrl": "https://github.com/uclouvain/openjpeg/tags",
|
"SourceUrl": "https://github.com/thinkoid/openjpeg/tags",
|
||||||
"Git": "https://github.com/uclouvain/openjpeg.git",
|
"Git": "https://github.com/thinkoid/openjpeg.git",
|
||||||
"Maintainer": "OpenJPEG team",
|
"Maintainer": "OpenJPEG team",
|
||||||
"MaintainerUrl": "http://www.openjpeg.org/",
|
"MaintainerUrl": "http://www.openjpeg.org/",
|
||||||
"Configure": "-DCMAKE_C_FLAGS='-fvisibility=hidden -g -Og -w -fpermissive'",
|
"Configure": "-DCMAKE_C_FLAGS='-fvisibility=hidden -g -Og -w -fpermissive'",
|
||||||
|
|
|
@ -31,7 +31,7 @@ if [ "${OPJ_PREVIOUS_VERSION:-}" != "" ]; then
|
||||||
else
|
else
|
||||||
OPJ_LIMIT_ABI_BUILDS="-limit 2"
|
OPJ_LIMIT_ABI_BUILDS="-limit 2"
|
||||||
fi
|
fi
|
||||||
OPJ_REPO="https://github.com/uclouvain/openjpeg.git"
|
OPJ_REPO="https://github.com/thinkoid/openjpeg.git"
|
||||||
OPJ_SSH_REPO=${OPJ_REPO/https:\/\/github.com\//git@github.com:}
|
OPJ_SSH_REPO=${OPJ_REPO/https:\/\/github.com\//git@github.com:}
|
||||||
OPJ_UPLOAD_BRANCH="gh-pages"
|
OPJ_UPLOAD_BRANCH="gh-pages"
|
||||||
OPJ_UPLOAD_DIR="abi-check"
|
OPJ_UPLOAD_DIR="abi-check"
|
||||||
|
|
|
@ -54,12 +54,12 @@ if [ "${OPJ_CI_SKIP_TESTS:-}" != "1" ]; then
|
||||||
else
|
else
|
||||||
OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up
|
OPJ_DATA_BRANCH=$(git -C ${OPJ_SOURCE_DIR} branch | grep '*' | tr -d '*[[:blank:]]') #default to same branch as we're setting up
|
||||||
fi
|
fi
|
||||||
OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/uclouvain/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l)
|
OPJ_DATA_HAS_BRANCH=$(git ls-remote --heads git://github.com/thinkoid/openjpeg-data.git ${OPJ_DATA_BRANCH} | wc -l)
|
||||||
if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then
|
if [ ${OPJ_DATA_HAS_BRANCH} -eq 0 ]; then
|
||||||
OPJ_DATA_BRANCH=master #default to master
|
OPJ_DATA_BRANCH=master #default to master
|
||||||
fi
|
fi
|
||||||
echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch"
|
echo "Cloning openjpeg-data from ${OPJ_DATA_BRANCH} branch"
|
||||||
git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/uclouvain/openjpeg-data.git data
|
git clone --depth=1 --branch=${OPJ_DATA_BRANCH} git://github.com/thinkoid/openjpeg-data.git data
|
||||||
|
|
||||||
# We need jpylyzer for the test suite
|
# We need jpylyzer for the test suite
|
||||||
JPYLYZER_VERSION="1.17.0"
|
JPYLYZER_VERSION="1.17.0"
|
||||||
|
|
|
@ -369,7 +369,7 @@ if [ "${OPJ_CI_PERF_TESTS:-}" == "1" ]; then
|
||||||
REF_VERSION=v2.1.2
|
REF_VERSION=v2.1.2
|
||||||
fi
|
fi
|
||||||
if [ ! -d ref_opj ]; then
|
if [ ! -d ref_opj ]; then
|
||||||
git clone https://github.com/uclouvain/openjpeg ref_opj
|
git clone https://github.com/thinkoid/openjpeg ref_opj
|
||||||
fi
|
fi
|
||||||
echo "Building reference version (${REF_VERSION})"
|
echo "Building reference version (${REF_VERSION})"
|
||||||
cd ref_opj
|
cd ref_opj
|
||||||
|
|
Loading…
Reference in New Issue