diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-12-29 00:21:38 +0000 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-12-29 00:21:38 +0000 |
commit | cffdafce2bf48d19c8a337d656f98edd4164f603 (patch) | |
tree | 0d82465990ff221054d448acf7d25e1de35288ac | |
parent | b3d521948ae32d6518c8c144ea33e848bc2f3274 (diff) | |
parent | fdb2369a03f57fe1cc11dbcaa99c67c1ce35b351 (diff) | |
download | clientdata-cffdafce2bf48d19c8a337d656f98edd4164f603.tar.gz clientdata-cffdafce2bf48d19c8a337d656f98edd4164f603.tar.bz2 clientdata-cffdafce2bf48d19c8a337d656f98edd4164f603.tar.xz clientdata-cffdafce2bf48d19c8a337d656f98edd4164f603.zip |
Merge branch 'stable' into 'master'
deploying stable only, switched spm to scheduled repository
See merge request evol/clientdata!205
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rwxr-xr-x | .tools/deploy.sh | 2 | ||||
-rwxr-xr-x | .tools/downloadlib.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df624bd7..444feaf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ pages: paths: - public only: - - master + - stable ok_job: stage: ok diff --git a/.tools/deploy.sh b/.tools/deploy.sh index 7184f4b8..cce9f99e 100755 --- a/.tools/deploy.sh +++ b/.tools/deploy.sh @@ -27,7 +27,7 @@ check_error $? cp -r upload/* ../../clientdata/public cd ../../clientdata -gitclone https://gitlab.com/4144 pagesindexgen.git pagesindexgen +gitclone https://gitlab.com/themanaworld/manaplus/ pagesindexgen.git pagesindexgen cd pagesindexgen ./pagesindexgen.py ../public check_error $? diff --git a/.tools/downloadlib.sh b/.tools/downloadlib.sh index b9a50d73..bdcccb45 100755 --- a/.tools/downloadlib.sh +++ b/.tools/downloadlib.sh @@ -6,7 +6,7 @@ export libname="$1_$2" mkdir libdownload cd libdownload rm "${zipname}" -../client-data/.tools/retry.sh wget -O "${zipname}" "https://gitlab.com/simplepackagemanager/spm/builds/artifacts/$1/download?job=${libname}" +../client-data/.tools/retry.sh wget -O "${zipname}" "https://gitlab.com/themanaworld/manaplus/spm/builds/artifacts/$1/download?job=${libname}" unzip "${zipname}" cp -r "bin/${libname}" .. cd .. |