aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-07-20 13:27:26 +0200
committerrubo77 <github@r.z11.de>2018-07-20 15:10:05 +0200
commit771de40474b80561c93331517efba684f9e722e8 (patch)
tree9cb74472993d3fb3474c9d1db0cacdd0a6a5d467
parent708fb5979da91615c6fcdea82b3e4c4536f13173 (diff)
copy the site dir into the images folder before upload
- show directory content for debugging and only one target
-rw-r--r--.gitlab-ci.yml8
-rwxr-xr-xgitlab-ci/build.sh2
2 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c129a83..485e063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,10 +76,18 @@ upload:
stage: upload
image: $CI_REGISTRY_IMAGE/build
script:
+ - pwd
- eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_KEY")
# create fake gluon dir to satisfy build script
- mkdir -p gluon
+ - ls
+ - ls output/
+ - ls output/images/
+ - mkdir -p output/images/site
+ - shopt -s extglob
+ - shopt -s dotglob
+ - cp -a !(output) output/images/site
- ./gitlab-ci/build.sh -c upload -b $CI_COMMIT_REF_NAME -n $CI_PIPELINE_ID
dependencies:
- build
diff --git a/gitlab-ci/build.sh b/gitlab-ci/build.sh
index cd0bbc8..6196157 100755
--- a/gitlab-ci/build.sh
+++ b/gitlab-ci/build.sh
@@ -15,7 +15,7 @@
MAKEOPTS="-j 4"
# Default to build all Gluon targets if parameter -t is not set
-TARGETS="ar71xx-generic ar71xx-tiny x86-64" # ar71xx-nand ar71xx-mikrotik mpc85xx-generic x86-generic x86-64"
+TARGETS="ar71xx-tiny" # ar71xx-generic x86-64 ar71xx-nand ar71xx-mikrotik mpc85xx-generic x86-generic x86-64"
# Default is set to use current work directory
SITEDIR="$(pwd)"