From bba3152be4856fc0958da389600bd55aa1c74396 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 22:55:13 +0200 Subject: [PATCH 1/7] Add packager --- .drone.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.drone.yml b/.drone.yml index 53f57addf5136..dc41ca6f2b95e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,6 +49,26 @@ steps: - name: cache path: /cache + - name: packager + image: joomlaprojects/docker-images:packager + environment: + FTP_USERNAME: + from_secret: ftpusername + FTP_PASSWORD: + from_secret: ftppassword + FTP_HOSTNAME: ci.joomla.org + FTP_PORT: "21" + FTP_DEST_DIR: /artifacts + FTP_VERIFY: "false" + FTP_SECURE: "true" + HTTP_ROOT: "https://ci.joomla.org/artifacts" + DRONE_PULL_REQUEST: DRONE_PULL_REQUEST + DRONE_COMMIT: DRONE_COMMIT + GITHUB_TOKEN: + from_secret: github_token + commands: + - /bin/drone_build.sh + - name: analysis3x image: rips/rips-cli:3.2.2 when: From eb2f9f27e8a9399f2b23ffae8bb51d6909220145 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:17:02 +0200 Subject: [PATCH 2/7] Drone test --- .drone.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index dc41ca6f2b95e..034d707331d07 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,26 @@ steps: - /usr/local/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla . - echo $(date) + - name: packager + image: itronic/test:packager + environment: + FTP_USERNAME: + from_secret: ftpusername + FTP_PASSWORD: + from_secret: ftppassword + FTP_HOSTNAME: ci.joomla.org + FTP_PORT: "21" + FTP_DEST_DIR: /artifacts + FTP_VERIFY: "false" + FTP_SECURE: "true" + HTTP_ROOT: "https://ci.joomla.org/artifacts" + DRONE_PULL_REQUEST: DRONE_PULL_REQUEST + DRONE_COMMIT: DRONE_COMMIT + GITHUB_TOKEN: + from_secret: github_token + commands: + - /bin/drone_build.sh + - name: restore-cache image: drillster/drone-volume-cache settings: @@ -49,26 +69,6 @@ steps: - name: cache path: /cache - - name: packager - image: joomlaprojects/docker-images:packager - environment: - FTP_USERNAME: - from_secret: ftpusername - FTP_PASSWORD: - from_secret: ftppassword - FTP_HOSTNAME: ci.joomla.org - FTP_PORT: "21" - FTP_DEST_DIR: /artifacts - FTP_VERIFY: "false" - FTP_SECURE: "true" - HTTP_ROOT: "https://ci.joomla.org/artifacts" - DRONE_PULL_REQUEST: DRONE_PULL_REQUEST - DRONE_COMMIT: DRONE_COMMIT - GITHUB_TOKEN: - from_secret: github_token - commands: - - /bin/drone_build.sh - - name: analysis3x image: rips/rips-cli:3.2.2 when: From e1ff139fd756353316cb4ac4c414fe99ac726a73 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:19:05 +0200 Subject: [PATCH 3/7] Drone test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 034d707331d07..b262080c55ad3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,7 @@ steps: - echo $(date) - name: packager - image: itronic/test:packager + image: itronic/test:latest environment: FTP_USERNAME: from_secret: ftpusername From 444a25dc7d8cf08b1cfc74233498e8a9a58ab3e3 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:24:14 +0200 Subject: [PATCH 4/7] Drone test --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b262080c55ad3..af0c533adc3f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,6 @@ kind: pipeline name: default clone: - depth: 42 steps: - name: phpcs From 8a75a854ecf8a1d86b7694b4f1d81fce7b97a713 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:30:25 +0200 Subject: [PATCH 5/7] Drone test --- .drone.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.drone.yml b/.drone.yml index af0c533adc3f6..bc524f1bba900 100644 --- a/.drone.yml +++ b/.drone.yml @@ -90,6 +90,33 @@ volumes: branches: exclude: [ l10n_* ] + +--- +kind: pipeline +name: package + +steps: + - name: packager + image: itronic/test:latest + environment: + FTP_USERNAME: + from_secret: ftpusername + FTP_PASSWORD: + from_secret: ftppassword + FTP_HOSTNAME: ci.joomla.org + FTP_PORT: "21" + FTP_DEST_DIR: /artifacts + FTP_VERIFY: "false" + FTP_SECURE: "true" + HTTP_ROOT: "https://ci.joomla.org/artifacts" + DRONE_PULL_REQUEST: DRONE_PULL_REQUEST + DRONE_COMMIT: DRONE_COMMIT + GITHUB_TOKEN: + from_secret: github_token + commands: + - /bin/drone_build.sh + + --- kind: signature hmac: 7d1fbc23a21067e251bb5d22a875c5db23c88520d0384f1913a73aa0c992d017 From aeada21a792ff4a201b4e0b167a65f3829fbba09 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:36:00 +0200 Subject: [PATCH 6/7] Add package pipeline --- .drone.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index bc524f1bba900..aee9a05d8db90 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,26 +12,6 @@ steps: - /usr/local/vendor/bin/phpcs --report=full --encoding=utf-8 --extensions=php -p --standard=build/phpcs/Joomla . - echo $(date) - - name: packager - image: itronic/test:latest - environment: - FTP_USERNAME: - from_secret: ftpusername - FTP_PASSWORD: - from_secret: ftppassword - FTP_HOSTNAME: ci.joomla.org - FTP_PORT: "21" - FTP_DEST_DIR: /artifacts - FTP_VERIFY: "false" - FTP_SECURE: "true" - HTTP_ROOT: "https://ci.joomla.org/artifacts" - DRONE_PULL_REQUEST: DRONE_PULL_REQUEST - DRONE_COMMIT: DRONE_COMMIT - GITHUB_TOKEN: - from_secret: github_token - commands: - - /bin/drone_build.sh - - name: restore-cache image: drillster/drone-volume-cache settings: From ceb547453ccd87dae6284eb3b52bb8dd89384915 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Mon, 6 Apr 2020 23:46:45 +0200 Subject: [PATCH 7/7] Sign drone --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index aee9a05d8db90..3f60aa809ba2d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -77,7 +77,7 @@ name: package steps: - name: packager - image: itronic/test:latest + image: joomlaprojects/docker-images:packager environment: FTP_USERNAME: from_secret: ftpusername @@ -99,6 +99,6 @@ steps: --- kind: signature -hmac: 7d1fbc23a21067e251bb5d22a875c5db23c88520d0384f1913a73aa0c992d017 +hmac: f107db083a8920dafd38b6f6ec51465628aadce6c0b9d747a2dbb80113490c61 ...