From 1eb392834c8e67cfc7fec17b62eb7ecc77512c6a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:10:56 +0100 Subject: [PATCH 01/11] use specifics images in ci --- .woodpecker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 47a4044..b3bc1ab 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,8 +1,10 @@ pipeline: dependencies: - image: gitnet.fr/deblan/devenv + image: node:16 + pull: true commands: - - make dep + - npm i + - npm link @nextcloud/vue when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] @@ -14,9 +16,9 @@ pipeline: failure: ignore build: - image: gitnet.fr/deblan/devenv + image: node:16 commands: - - make build + - npm run build when: branch: [master, develop, feature/*, translations] event: [push, pull_request] @@ -37,11 +39,13 @@ pipeline: event: [pull_request] package: - image: gitnet.fr/deblan/devenv + image: deblan/php:8.0 volumes: - /var/www/html/artifacts:/var/www/html/artifacts secrets: [app_certificate] commands: + - apt-get update + - apt-get install -y zip make - mkdir -p "$HOME/.nextcloud/certificates" - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key" - export VERSION=$(grep "" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never) From 02afac526747050a5f7419c2615b5eb0b05b730e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:11:16 +0100 Subject: [PATCH 02/11] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index fc48124..4c165a0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.0 + 3.7.1-b1 agpl Simon Vieille SideMenu From fc5a6a4c641429477a66b71e82f708f2d84d7f16 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:13:31 +0100 Subject: [PATCH 03/11] fix typo in ci configuration --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b3bc1ab..b4ecc4f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -18,7 +18,7 @@ pipeline: build: image: node:16 commands: - - npm run build + - npm run build when: branch: [master, develop, feature/*, translations] event: [push, pull_request] From 112e669723a7584086d3f3c1ece843a481d67a0a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:22:35 +0100 Subject: [PATCH 04/11] reduce release task as packaging (ci) move translation build in specific step (ci) --- .woodpecker.yml | 10 +++++++++- Makefile | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b4ecc4f..dd9db2e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -15,7 +15,7 @@ pipeline: - osv-detector package-lock.json failure: ignore - build: + build_js: image: node:16 commands: - npm run build @@ -23,6 +23,14 @@ pipeline: branch: [master, develop, feature/*, translations] event: [push, pull_request] + build_php: + image: deblan/php:8.0 + commands: + - php bin/generate_l10n.php + when: + branch: [master, develop, feature/*, translations] + event: [push, pull_request] + code_quality: image: sonarsource/sonar-scanner-cli secrets: [sonar_token, sonar_host, sonar_project] diff --git a/Makefile b/Makefile index 783bb6a..e5b6267 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ dep: npm link @nextcloud/vue || sudo npm link @nextcloud/vue .ONESHELL: -release: build translations +release: if [ -z "$$VERSION" ]; then echo "VERSION required" exit 1 From 3a51e6ecd5da2e76ffa7296bbdc61432cb307832 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:22:59 +0100 Subject: [PATCH 05/11] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 4c165a0..06eabf1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.1-b1 + 3.7.1-b2 agpl Simon Vieille SideMenu From 7227f59dabe6185e8d43ce9e53f6354f5eb225c3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 17 Mar 2023 17:25:22 +0100 Subject: [PATCH 06/11] add tag on event restriction for build steps --- .woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index dd9db2e..fd4c65d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -21,7 +21,7 @@ pipeline: - npm run build when: branch: [master, develop, feature/*, translations] - event: [push, pull_request] + event: [tag, push, pull_request] build_php: image: deblan/php:8.0 @@ -29,7 +29,7 @@ pipeline: - php bin/generate_l10n.php when: branch: [master, develop, feature/*, translations] - event: [push, pull_request] + event: [tag, push, pull_request] code_quality: image: sonarsource/sonar-scanner-cli From 097ccc9dc9af0e141285f52890020f97d824f6e0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:34:23 +0100 Subject: [PATCH 07/11] update ci conf --- .woodpecker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fd4c65d..576865e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,8 +3,7 @@ pipeline: image: node:16 pull: true commands: - - npm i - - npm link @nextcloud/vue + - npm ci when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] From 7d0b55243eb378d1c20596e3e07fbd6d0b9617f0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:34:52 +0100 Subject: [PATCH 08/11] add debug version --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 06eabf1..89461b0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.1-b2 + 3.7.1-b3 agpl Simon Vieille SideMenu From 3a8021565794bb228fc449a62eaa50ec0f0b86f0 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:35:59 +0100 Subject: [PATCH 09/11] update ci conf --- .woodpecker.yml | 2 +- appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 576865e..ca16045 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ pipeline: image: node:16 pull: true commands: - - npm ci + - npm i when: event: [tag, push, pull_request] branch: [master, develop, feature/*, translations] diff --git a/appinfo/info.xml b/appinfo/info.xml index 89461b0..b208bd0 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.1-b3 + 3.7.1-b4 agpl Simon Vieille SideMenu From 019f79d45f3dea30dd538531ace97c65e6cc1d3c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:45:51 +0100 Subject: [PATCH 10/11] update ci conf --- .woodpecker.yml | 2 +- appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ca16045..59a771b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -9,7 +9,7 @@ pipeline: branch: [master, develop, feature/*, translations] osv_detector: - image: gitnet.fr/deblan/docker-osv-detector:v0.9 + image: gitnet.fr/deblan/osv-detector:v0.10 commands: - osv-detector package-lock.json failure: ignore diff --git a/appinfo/info.xml b/appinfo/info.xml index b208bd0..d14d467 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.1-b4 + 3.7.1 agpl Simon Vieille SideMenu From 42043c5390132fc950a39f1e7efd455d84b981cb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 19 Mar 2023 09:52:37 +0100 Subject: [PATCH 11/11] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c979fe2..42089a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +## 3.7.1 +### Fixed +* fix build process (#230) + ## 3.7.0 ### Added * add translations (thanks to AHOHNMYC)