From b39762cc847ad3a3a553196c68d123941d31b5c2 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:19:24 +0000 Subject: [PATCH 1/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d898a2..4591752 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,11 @@ variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor + - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python build: script: + - ./get_app_data.py $HAAPS_TOKEN - hugo - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; rmdir '$CI_PROJECT_NAME';' - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; mkdir '$CI_PROJECT_NAME'; cd '$CI_PROJECT_NAME'; lcd public; mput *' From fff4875ff786c416dfa68e77417d19119fa481f7 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:20:41 +0000 Subject: [PATCH 2/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4591752..4d42210 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,8 @@ before_script: build: script: - - ./get_app_data.py $HAAPS_TOKEN + - ls -la + - python get_app_data.py $HAAPS_TOKEN - hugo - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; rmdir '$CI_PROJECT_NAME';' - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; mkdir '$CI_PROJECT_NAME'; cd '$CI_PROJECT_NAME'; lcd public; mput *' From 927051477706d29d944d72e1d2e95e4551f43e3c Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:21:48 +0000 Subject: [PATCH 3/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d42210..7ec9809 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python + - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python-requests build: script: From 0ba1da6e0e035f4bf6515a5ae209ab47328949a8 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:25:19 +0000 Subject: [PATCH 4/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ec9809..370a7d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ before_script: build: script: - - ls -la + - pip install requests - python get_app_data.py $HAAPS_TOKEN - hugo - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; rmdir '$CI_PROJECT_NAME';' From 156570a5cf7c12d4c58ed5bcb3910191f3136bc5 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:25:41 +0000 Subject: [PATCH 5/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 370a7d4..81fe93f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python-requests + - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python-pip build: script: From cc69e4da4f7733ce66d9e4c7a78381b0fc1d941e Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:26:15 +0000 Subject: [PATCH 6/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81fe93f..6192c34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor python-pip + - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor build: script: From a4ea28d8be4186f235330154702be189bbd47d02 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:27:32 +0000 Subject: [PATCH 7/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6192c34..69372ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive before_script: - - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor + - apk --no-cache upgrade && apk --no-cache add samba samba-common-tools supervisor py-pip build: script: From 55aabad630a6866a96c2db2afac1a1f693621038 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Mon, 29 Oct 2018 14:29:38 +0000 Subject: [PATCH 8/8] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69372ce..afec203 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ before_script: build: script: - pip install requests - - python get_app_data.py $HAAPS_TOKEN + - python get_app_data.py $HAASP_TOKEN - hugo - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; rmdir '$CI_PROJECT_NAME';' - smbclient '//192.168.30.10/pages' $PASS -U $USER -c 'prompt OFF; recurse ON; mkdir '$CI_PROJECT_NAME'; cd '$CI_PROJECT_NAME'; lcd public; mput *'