From 6bf18b47a89979c785b77a4b943199ed47cf050b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 28 Jul 2022 03:53:47 +0200 Subject: [PATCH 1/2] Changed: - convert double-quotes to single --- rendertime/rendertime.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index 3e613d04..aa41dfa9 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -28,7 +28,7 @@ function rendertime_init_1(App $a) function rendertime_addon_admin(App $a, string &$o) { - $t = Renderer::getMarkupTemplate("admin.tpl", "addon/rendertime/"); + $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/rendertime/'); $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Save Settings'), @@ -53,7 +53,7 @@ function rendertime_page_end(App $a, string &$o) $duration = microtime(true) - $profiler->get('start'); - $ignored_modules = ["fbrowser"]; + $ignored_modules = ['fbrowser']; $ignored = in_array(DI::args()->getModuleName(), $ignored_modules); if ($a->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) { -- 2.43.0 From 795eb1bb367dd687ac4b94d3fb9bf86856db356b Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 28 Jul 2022 20:34:52 +0200 Subject: [PATCH 2/2] Replace SFTP-publish with docker-publish --- .woodpecker/.continuous-deployment.yml | 33 ++++---------------------- .woodpecker/.releaser.yml | 33 ++++---------------------- 2 files changed, 8 insertions(+), 58 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index cdf898e1..46a32d9f 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -100,37 +100,12 @@ pipeline: repo: friendica/friendica-addons branch: [ develop, '*-rc' ] event: push - upload_artifacts: + publish_artifacts: image: alpine - secrets: - - source: sftp_host - target: lftp_host - - source: sftp_user - target: lftp_user - - source: ssh_key - target: lftp_key - environment: - LFTP_PORT: "22" - LFTP_SOURCE: "build" - LFTP_TARGET: "/http" - volumes: - - /etc/hosts:/etc/hosts commands: - - apk add lftp openssh openssl - - touch drone.key - - chmod 400 drone.key - - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key - - lftp -c " - set net:timeout 5; - set net:max-retries 2; - set net:reconnect-interval-base 5; - set sftp:auto-confirm true; - set sftp:connect-program 'ssh -q -a -x -i drone.key'; - connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT; - cd $LFTP_TARGET; - mput $LFTP_SOURCE/*; - " - - rm drone.key + - cp -fr build/* /tmp/friendica_files/ + volumes: + - files:/tmp/friendica_files when: repo: friendica/friendica-addons branch: [ develop, '*-rc' ] diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 8761b2fe..cd8ae368 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -94,37 +94,12 @@ pipeline: when: repo: friendica/friendica-addons event: tag - upload_artifacts: + publish_artifacts: image: alpine - secrets: - - source: sftp_host - target: lftp_host - - source: sftp_user - target: lftp_user - - source: ssh_key - target: lftp_key - environment: - LFTP_PORT: "22" - LFTP_SOURCE: "build" - LFTP_TARGET: "/http" - volumes: - - /etc/hosts:/etc/hosts commands: - - apk add lftp openssh openssl - - touch drone.key - - chmod 400 drone.key - - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key - - lftp -c " - set net:timeout 5; - set net:max-retries 2; - set net:reconnect-interval-base 5; - set sftp:auto-confirm true; - set sftp:connect-program 'ssh -q -a -x -i drone.key'; - connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT; - cd $LFTP_TARGET; - mput $LFTP_SOURCE/*; - " - - rm drone.key + - cp -fr build/* /tmp/friendica_files/ + volumes: + - files:/tmp/friendica_files when: repo: friendica/friendica-addons event: tag -- 2.43.0