From b331dde0dd4afa7b0fc4297b981ac13411fc6bac Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 22 Jan 2024 05:19:30 +0100 Subject: [PATCH 1/8] Upgrade to v2.2.2 Changelog: https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.2.2 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 35536f6..e37a6f6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Woodpecker" description.en = "CI engine with great extensibility integrated with GitHub, GitLab, Gitea..." description.fr = "Outil d'intégration continue extensible intégrable avec GitHub, GitLab, Gitea..." -version = "1.0.5~ynh2" +version = "2.2.2~ynh1" maintainers = ["Salamandar"] @@ -79,11 +79,11 @@ ram.runtime = "200M" [resources.sources] [resources.sources.main] - amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" - amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" + amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v2.2.2/woodpecker-server_linux_amd64.tar.gz" + amd64.sha256 = "622863163084529969422a3a6e70b8fd29bb11513e4f4d125dd6604987976333" - arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz" - arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c" + arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v2.2.2/woodpecker-server_linux_arm64.tar.gz" + arm64.sha256 = "ba9e9ca23389d3b0195a874819586e024ab57435018bc977f38816cf5e35f9d9" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz" From 9bffb61d7ea6d784db375ee4ad901458b781adfe Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 22 Jan 2024 04:19:33 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25b48f0..01522b7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Woodpecker is a simple CI engine with great extensibility. -**Shipped version:** 1.0.5~ynh2 +**Shipped version:** 2.2.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 60a0cf9..be3ea24 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Woodpecker est un moteur CI simple avec une grande extensibilité. -**Version incluse :** 1.0.5~ynh2 +**Version incluse :** 2.2.2~ynh1 ## Captures d’écran From f6c09a2562a3865a3e17a58ad00322a21dbef567 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:16:11 +0100 Subject: [PATCH 3/8] fix app conf in change url script --- scripts/change_url | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index ae914ad..3f7d8fe 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,6 +25,17 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config +#================================================= +# MODIFY URL IN WOODPECKER CONF +#================================================= +ynh_script_progression --message="Updating configuration file..." --weight=1 + +path_no_trailing_slash=${path%/} + +ynh_add_config --template="woodpecker-server.conf" --destination="$install_dir/woodpecker-server.conf" +chmod 400 "$install_dir/woodpecker-server.conf" +chown "$app:$app" "$install_dir/woodpecker-server.conf" + #================================================= # GENERIC FINALISATION #================================================= From bf3d8e1cbd3fb9b81ab63cb6ee3a7916a9b2a27b Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:30:15 +0100 Subject: [PATCH 4/8] Update change_url --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index 3f7d8fe..7d4a805 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,6 +31,7 @@ ynh_change_url_nginx_config ynh_script_progression --message="Updating configuration file..." --weight=1 path_no_trailing_slash=${path%/} +_woodpecker_set_forge_config ynh_add_config --template="woodpecker-server.conf" --destination="$install_dir/woodpecker-server.conf" chmod 400 "$install_dir/woodpecker-server.conf" From b79b7785718ed7f6cddd80719ab943196b1eb5be Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:44:51 +0100 Subject: [PATCH 5/8] add grpc port --- conf/woodpecker-server.conf | 2 +- manifest.toml | 47 +++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/conf/woodpecker-server.conf b/conf/woodpecker-server.conf index d6ad5cf..f3f15b0 100644 --- a/conf/woodpecker-server.conf +++ b/conf/woodpecker-server.conf @@ -41,7 +41,7 @@ WOODPECKER_SERVER_ADDR=:__PORT__ # Configures the gRPC listener port. # Default: :9000 -#WOODPECKER_GRPC_ADDR= +WOODPECKER_GRPC_ADDR=:__GRPC_PORT__ # Comma-separated list of admin accounts. # Default: empty diff --git a/manifest.toml b/manifest.toml index 35536f6..49dc6d8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Outil d'intégration continue extensible intégrable avec GitH version = "1.0.5~ynh2" -maintainers = ["Salamandar"] +maintainers = [ "Salamandar" ] [upstream] license = "Apache-2.0" @@ -23,7 +23,7 @@ fund = "https://opencollective.com/woodpecker-ci" [integration] yunohost = ">= 11.2" -architectures = ["amd64", "arm64"] +architectures = [ "amd64", "arm64" ] multi_instance = true ldap = false @@ -78,34 +78,35 @@ ram.runtime = "200M" [resources] [resources.sources] - [resources.sources.main] - amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" - amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" + [resources.sources.main] + amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" + amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" - arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz" - arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c" + arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz" + arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c" - autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz" - autoupdate.asset.arm64 = "woodpecker-server_linux_arm64.tar.gz" + autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz" + autoupdate.asset.arm64 = "woodpecker-server_linux_arm64.tar.gz" - in_subdir = false + in_subdir = false - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.data_dir] +[resources.data_dir] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.ports] +[resources.ports] - [resources.apt] - packages = [ - "postgresql" - ] +main.default = 8000 +grpc.default = 9000 - [resources.database] - type = "postgresql" +[resources.apt] +packages = [ "postgresql" ] + +[resources.database] +type = "postgresql" From 97fabf63903e6494a31d20c52541f8eec07c0637 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:50:09 +0100 Subject: [PATCH 6/8] typo --- tests.toml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/tests.toml b/tests.toml index 9a8d950..6ee92fc 100644 --- a/tests.toml +++ b/tests.toml @@ -4,26 +4,26 @@ test_format = 1.0 [default] - # exclude = ["install.private", "install.multi"] - # The test IDs to be used in only/exclude statements are: - # * install.root - # * install.subdir - # * install.nourl - # * install.multi - # * backup_restore - # * upgrade - # * upgrade.someCommitId - # * change_url - # NB: you should NOT need this except if you really have a good reason... +# exclude = ["install.private", "install.multi"] +# The test IDs to be used in only/exclude statements are: +# * install.root +# * install.subdir +# * install.nourl +# * install.multi +# * backup_restore +# * upgrade +# * upgrade.someCommitId +# * change_url +# NB: you should NOT need this except if you really have a good reason... - # For special usecases, sometimes you need to setup other things on the machine - # prior to installing the app (such as installing another app) - # (Remove this key entirely if not needed) - # preinstall = """ - # sudo yunohost app install foobar - # sudo yunohost user list - # """ - args.forge_type = "github" - args.forge_url = "https://github.com" - args.forge_client = "dammy client" - args.forge_secret = "dummy secret" +# For special usecases, sometimes you need to setup other things on the machine +# prior to installing the app (such as installing another app) +# (Remove this key entirely if not needed) +# preinstall = """ +# sudo yunohost app install foobar +# sudo yunohost user list +# """ +args.forge_type = "github" +args.forge_url = "https://github.com" +args.forge_client = "dummy client" +args.forge_secret = "dummy secret" From ab166b2d37ef9c3e2a236dbaaaa135033cb2f0d4 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 01:52:35 +0100 Subject: [PATCH 7/8] fix variable name --- conf/woodpecker-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/woodpecker-server.conf b/conf/woodpecker-server.conf index f3f15b0..0254e2d 100644 --- a/conf/woodpecker-server.conf +++ b/conf/woodpecker-server.conf @@ -41,7 +41,7 @@ WOODPECKER_SERVER_ADDR=:__PORT__ # Configures the gRPC listener port. # Default: :9000 -WOODPECKER_GRPC_ADDR=:__GRPC_PORT__ +WOODPECKER_GRPC_ADDR=:__PORT_GRPC__ # Comma-separated list of admin accounts. # Default: empty From 72a741b99b89d3658f1d55b7fd2473f37fd68369 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Sun, 28 Jan 2024 02:08:51 +0100 Subject: [PATCH 8/8] add info about the gRPC port number in the admin panel --- doc/admin.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/admin.md diff --git a/doc/admin.md b/doc/admin.md new file mode 100644 index 0000000..193c8b4 --- /dev/null +++ b/doc/admin.md @@ -0,0 +1 @@ +Your gRPC port: `__PORT_GRPC__`