Compare commits

...

15 Commits

Author SHA1 Message Date
Simon Vieille aaf2bb55db Merge pull request 'release v3.7.1' (#232) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/232
2023-03-19 10:00:00 +01:00
Simon Vieille a7ec95da7c Merge pull request 'Fix build process' (#231) from fix/issue230 into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/231
2023-03-19 09:58:11 +01:00
Simon Vieille 42043c5390 update changelog 2023-03-19 09:52:37 +01:00
Simon Vieille 019f79d45f update ci conf 2023-03-19 09:45:51 +01:00
Simon Vieille 3a80215657 update ci conf 2023-03-19 09:35:59 +01:00
Simon Vieille 7d0b55243e add debug version 2023-03-19 09:34:52 +01:00
Simon Vieille 097ccc9dc9 update ci conf 2023-03-19 09:34:23 +01:00
Simon Vieille 7227f59dab add tag on event restriction for build steps 2023-03-17 17:25:22 +01:00
Simon Vieille 3a51e6ecd5 add debug version 2023-03-17 17:22:59 +01:00
Simon Vieille 112e669723 reduce release task as packaging (ci)
move translation build in specific step (ci)
2023-03-17 17:22:35 +01:00
Simon Vieille fc5a6a4c64 fix typo in ci configuration 2023-03-17 17:13:31 +01:00
Simon Vieille 02afac5267 add debug version 2023-03-17 17:11:16 +01:00
Simon Vieille 1eb392834c use specifics images in ci 2023-03-17 17:10:56 +01:00
Simon Vieille 749f25a231 Merge pull request 'add badge of downloads' (#228) from develop into master
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/228
2023-03-11 00:30:39 +01:00
Simon Vieille 5df389dd42 add badge of downloads 2023-03-11 00:29:32 +01:00
5 changed files with 26 additions and 10 deletions
+19 -8
View File
@@ -1,25 +1,34 @@
pipeline: pipeline:
dependencies: dependencies:
image: gitnet.fr/deblan/devenv image: node:16
pull: true
commands: commands:
- make dep - npm i
when: when:
event: [tag, push, pull_request] event: [tag, push, pull_request]
branch: [master, develop, feature/*, translations] branch: [master, develop, feature/*, translations]
osv_detector: osv_detector:
image: gitnet.fr/deblan/docker-osv-detector:v0.9 image: gitnet.fr/deblan/osv-detector:v0.10
commands: commands:
- osv-detector package-lock.json - osv-detector package-lock.json
failure: ignore failure: ignore
build: build_js:
image: gitnet.fr/deblan/devenv image: node:16
commands: commands:
- make build - npm run build
when: when:
branch: [master, develop, feature/*, translations] branch: [master, develop, feature/*, translations]
event: [push, pull_request] event: [tag, push, pull_request]
build_php:
image: deblan/php:8.0
commands:
- php bin/generate_l10n.php
when:
branch: [master, develop, feature/*, translations]
event: [tag, push, pull_request]
code_quality: code_quality:
image: sonarsource/sonar-scanner-cli image: sonarsource/sonar-scanner-cli
@@ -37,11 +46,13 @@ pipeline:
event: [pull_request] event: [pull_request]
package: package:
image: gitnet.fr/deblan/devenv image: deblan/php:8.0
volumes: volumes:
- /var/www/html/artifacts:/var/www/html/artifacts - /var/www/html/artifacts:/var/www/html/artifacts
secrets: [app_certificate] secrets: [app_certificate]
commands: commands:
- apt-get update
- apt-get install -y zip make
- mkdir -p "$HOME/.nextcloud/certificates" - mkdir -p "$HOME/.nextcloud/certificates"
- echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key" - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
- export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never) - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+4
View File
@@ -1,5 +1,9 @@
## [Unreleased] ## [Unreleased]
## 3.7.1
### Fixed
* fix build process (#230)
## 3.7.0 ## 3.7.0
### Added ### Added
* add translations (thanks to AHOHNMYC) * add translations (thanks to AHOHNMYC)
+1 -1
View File
@@ -9,7 +9,7 @@ dep:
npm link @nextcloud/vue || sudo npm link @nextcloud/vue npm link @nextcloud/vue || sudo npm link @nextcloud/vue
.ONESHELL: .ONESHELL:
release: build translations release:
if [ -z "$$VERSION" ]; then if [ -z "$$VERSION" ]; then
echo "VERSION required" echo "VERSION required"
exit 1 exit 1
+1
View File
@@ -3,6 +3,7 @@
[![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu) [![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
[![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/) [![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/)
![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php)
Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top. Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable. You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.
+1 -1
View File
@@ -32,7 +32,7 @@ Notice
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. 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/). In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
]]></description> ]]></description>
<version>3.7.0</version> <version>3.7.1</version>
<licence>agpl</licence> <licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author> <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
<namespace>SideMenu</namespace> <namespace>SideMenu</namespace>