Merge pull request #15 from YunoHost-Apps/testing

Testing v2.2.2~ynh1

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
 

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
 

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=:__PORT_GRPC__
 
 # Comma-separated list of admin accounts.
 # Default: empty

doc/admin.md

@@ -0,0 +1 @@
+Your gRPC port: `__PORT_GRPC__`

manifest.toml

@@ -7,9 +7,9 @@ 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"]
+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
@@ -79,33 +79,34 @@ 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.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v2.2.2/woodpecker-server_linux_amd64.tar.gz"
-    amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef"
+    amd64.sha256 = "622863163084529969422a3a6e70b8fd29bb11513e4f4d125dd6604987976333"
 
-    arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_arm64.tar.gz"
+    arm64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v2.2.2/woodpecker-server_linux_arm64.tar.gz"
-    arm64.sha256 = "a2b20b569daac3f9c4ebc5fb17026a2679f30d3ee7004bd6f09d63d1f102361c"
+    arm64.sha256 = "ba9e9ca23389d3b0195a874819586e024ab57435018bc977f38816cf5e35f9d9"
 
-    autoupdate.strategy = "latest_github_release"
+        autoupdate.strategy = "latest_github_release"
-    autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz"
+        autoupdate.asset.amd64 = "woodpecker-server_linux_amd64.tar.gz"
-    autoupdate.asset.arm64 = "woodpecker-server_linux_arm64.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]
+[resources.permissions]
-    main.url = "/"
+main.url = "/"
 
-    [resources.ports]
+[resources.ports]
 
-    [resources.apt]
+main.default = 8000
-    packages = [
+grpc.default = 9000
-        "postgresql"
-    ]
 
-    [resources.database]
+[resources.apt]
-    type = "postgresql"
+packages = [ "postgresql" ]
+
+[resources.database]
+type = "postgresql"

scripts/change_url

@@ -25,6 +25,18 @@ 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%/}
+_woodpecker_set_forge_config
+
+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
 #=================================================

tests.toml

@@ -4,26 +4,26 @@ test_format = 1.0
 
 [default]
 
-    # exclude = ["install.private", "install.multi"]
+# exclude = ["install.private", "install.multi"]
-    # The test IDs to be used in only/exclude statements are:
+# The test IDs to be used in only/exclude statements are:
-    # * install.root
+# * install.root
-    # * install.subdir
+# * install.subdir
-    # * install.nourl
+# * install.nourl
-    # * install.multi
+# * install.multi
-    # * backup_restore
+# * backup_restore
-    # * upgrade
+# * upgrade
-    # * upgrade.someCommitId
+# * upgrade.someCommitId
-    # * change_url
+# * change_url
-    # NB: you should NOT need this except if you really have a good reason...
+# 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
+# For special usecases, sometimes you need to setup other things on the machine
-    # prior to installing the app (such as installing another app)
+# prior to installing the app (such as installing another app)
-    # (Remove this key entirely if not needed)
+# (Remove this key entirely if not needed)
-    # preinstall = """
+# preinstall = """
-    # sudo yunohost app install foobar
+# sudo yunohost app install foobar
-    # sudo yunohost user list
+# sudo yunohost user list
-    # """
+# """
-    args.forge_type = "github"
+args.forge_type = "github"
-    args.forge_url = "https://github.com"
+args.forge_url = "https://github.com"
-    args.forge_client = "dammy client"
+args.forge_client = "dummy client"
-    args.forge_secret = "dummy secret"
+args.forge_secret = "dummy secret"