From 2ed241e2564a70ccea91e69c8e094b87c894dd01 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Thu, 10 Feb 2022 23:59:41 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index c865e60..fd17a8b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,6 +11,7 @@ steps: - echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist - cat /etc/pacman.d/mirrorlist - pacman -Syu --noconfirm + - ls -la - bash archiso_make.sh - name: scp files -- 2.34.1 From 5d01274b6f3aeab188e5373204fc9868306251ec Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 00:02:14 +0300 Subject: [PATCH 2/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index fd17a8b..22f8b62 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: - echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist - cat /etc/pacman.d/mirrorlist - pacman -Syu --noconfirm - - ls -la + - pwd; ls -la - bash archiso_make.sh - name: scp files -- 2.34.1 From 07af9fc2f8564cc68d03db7cd5fc7ce76e0cc119 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 00:04:24 +0300 Subject: [PATCH 3/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 22f8b62..4868165 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: - echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist - cat /etc/pacman.d/mirrorlist - pacman -Syu --noconfirm - - pwd; ls -la + - pwd; ls -la ; ls -la / ; cd /drone/src - bash archiso_make.sh - name: scp files -- 2.34.1 From e255b1f78182bcaf1c2a24ced344164d70705395 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 00:32:53 +0300 Subject: [PATCH 4/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4868165..f1778e4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: - echo "Server = http://mirror.yandex.ru/archlinux/\$repo/os/\$arch" > /etc/pacman.d/mirrorlist - cat /etc/pacman.d/mirrorlist - pacman -Syu --noconfirm - - pwd; ls -la ; ls -la / ; cd /drone/src + - cd /drone/src - bash archiso_make.sh - name: scp files @@ -24,9 +24,23 @@ steps: password: from_secret: scp_pass port: 22 - source: /root/archlinux-*-x86_64.iso + source: /drone/src/archiso_out/archlinux-*-x86_64.iso target: /var/www/mirror + - name: send telegram notification + image: appleboy/drone-telegram + settings: + token: + from_secret: tg_token + to: + from_secret: tg_user + message: > + {{#success build.status}} + build {{build.number}} succeeded. Good job. + {{else}} + build {{build.number}} failed. Fix me please. + {{/success}} + #- name: gitea_release # image: plugins/gitea-release # settings: -- 2.34.1 From 7f6c652266597270636108f379f4c2ac7cbfa2e3 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 00:33:37 +0300 Subject: [PATCH 5/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index f1778e4..3232cf2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,19 +27,19 @@ steps: source: /drone/src/archiso_out/archlinux-*-x86_64.iso target: /var/www/mirror - - name: send telegram notification - image: appleboy/drone-telegram - settings: - token: - from_secret: tg_token - to: - from_secret: tg_user - message: > - {{#success build.status}} - build {{build.number}} succeeded. Good job. - {{else}} - build {{build.number}} failed. Fix me please. - {{/success}} +- name: send telegram notification + image: appleboy/drone-telegram + settings: + token: + from_secret: tg_token + to: + from_secret: tg_user + message: > + {{#success build.status}} + build {{build.number}} succeeded. Good job. + {{else}} + build {{build.number}} failed. Fix me please. + {{/success}} #- name: gitea_release # image: plugins/gitea-release -- 2.34.1 From 67610fc6b8b9e771e4baee85ec443aae3e27a7b7 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 00:34:25 +0300 Subject: [PATCH 6/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3232cf2..cf50211 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ steps: from_secret: tg_token to: from_secret: tg_user - message: > + message: > {{#success build.status}} build {{build.number}} succeeded. Good job. {{else}} -- 2.34.1 From 33dbba7923cc5161a1774a08e5db2a7395093385 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 11:42:17 +0300 Subject: [PATCH 7/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index cf50211..112f461 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,6 +26,7 @@ steps: port: 22 source: /drone/src/archiso_out/archlinux-*-x86_64.iso target: /var/www/mirror + strip_components: 1 - name: send telegram notification image: appleboy/drone-telegram -- 2.34.1 From 11a6e77db1683320d6c83a6f881be1388411abe0 Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 11:59:15 +0300 Subject: [PATCH 8/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 112f461..b992139 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,10 +37,14 @@ steps: from_secret: tg_user message: > {{#success build.status}} - build {{build.number}} succeeded. Good job. + build {{build.number}} of {{repo.name}} succeeded. Commit: {{commit.message}}. Duration: {{since build.started}}. Good job. {{else}} - build {{build.number}} failed. Fix me please. + build {{build.number}} of {{repo.name}} failed. Commit: {{commit.message}}. Duration: {{since build.started}}. Fix me please. {{/success}} + when: + status: + - success + - failure #- name: gitea_release # image: plugins/gitea-release -- 2.34.1 From a8ce42db9f8fd5305e01dd25c5961f93f747943e Mon Sep 17 00:00:00 2001 From: Ivan Vazhov Date: Fri, 11 Feb 2022 12:25:01 +0300 Subject: [PATCH 9/9] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=80=D0=B5=D0=BF=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b992139..f89e5da 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,7 +26,7 @@ steps: port: 22 source: /drone/src/archiso_out/archlinux-*-x86_64.iso target: /var/www/mirror - strip_components: 1 + strip_components: 3 - name: send telegram notification image: appleboy/drone-telegram -- 2.34.1