aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Schramm <tobleminer@gmail.com>2018-07-20 15:24:09 +0200
committerTobias Schramm <tobleminer@gmail.com>2018-07-20 15:24:09 +0200
commit1990bebfef5a30ab6bce79537250b0a84674cc55 (patch)
tree6c3b6889e636b6569023c3952f9d42d877bc01ec
parent771de40474b80561c93331517efba684f9e722e8 (diff)
Revert "copy the site dir into the images folder before upload"
This reverts commit 771de40474b80561c93331517efba684f9e722e8.
-rw-r--r--.gitlab-ci.yml8
-rwxr-xr-xgitlab-ci/build.sh2
2 files changed, 1 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 485e063..c129a83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,18 +76,10 @@ 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 6196157..cd0bbc8 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-tiny" # ar71xx-generic x86-64 ar71xx-nand ar71xx-mikrotik mpc85xx-generic x86-generic x86-64"
+TARGETS="ar71xx-generic ar71xx-tiny x86-64" # ar71xx-nand ar71xx-mikrotik mpc85xx-generic x86-generic x86-64"
# Default is set to use current work directory
SITEDIR="$(pwd)"