Merge pull request #161 from YunoHost-Apps/testing

14.1.1

README.md

@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features.
 
-**Shipped version:** 14.1.0~ynh1
+**Shipped version:** 14.1.1~ynh1
 
 **Demo:** https://gitlab.com/explore
 

README_fr.md

@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD.
 
-**Version incluse :** 14.1.0~ynh1
+**Version incluse :** 14.1.1~ynh1
 
 **Démo :** https://gitlab.com/explore
 

manifest.json

@@ -2,7 +2,7 @@
     "name": "GitLab",
     "id": "gitlab",
     "packaging_format": 1,
-    "version": "14.1.0~ynh1",
+    "version": "14.1.1~ynh1",
     "description": {
         "en": "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features.",
         "fr": "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD."

scripts/upgrade.d/upgrade.14.first.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+gitlab_version="14.0.6"
+
+# sha256sum found here: https://packages.gitlab.com/gitlab
+gitlab_debian_version="buster"
+
+gitlab_x86_64_buster_source_sha256="2ea56af1df12b823225de4c0ec1d06b1e143ca7d8eea2ab56b82ddeb94a6d0e8"
+
+gitlab_arm64_buster_source_sha256="84530fef7ab7ade92e5e64461fbdea9b22e7264af6005b9782b816d0ac66c77d"
+
+gitlab_arm_buster_source_sha256="f3f625c422ecf442d382fbc61222f86b0b0bf635dc96e09e703b2dd8b17cb7ed"
+
+architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
+
+if [ "$architecture" = "x86-64" ]; then
+	gitlab_source_sha256=$gitlab_x86_64_buster_source_sha256
+elif [ "$architecture" = "arm64" ]; then
+	gitlab_source_sha256=$gitlab_arm64_buster_source_sha256
+elif [ "$architecture" = "arm" ]; then
+	# If the version for arm doesn't exist, then use an older one
+	if [ -z "$gitlab_arm_buster_source_sha256" ]; then
+		gitlab_version="14.0.6"
+		gitlab_arm_buster_source_sha256="f3f625c422ecf442d382fbc61222f86b0b0bf635dc96e09e703b2dd8b17cb7ed"
+	fi
+	gitlab_source_sha256=$gitlab_arm_buster_source_sha256
+fi
+
+gitlab_filename="gitlab-ce-${gitlab_version}.deb"
+
+# Action to do in case of failure of the package_check
+package_check_action() {
+	ynh_backup_if_checksum_is_different --file="$config_path/gitlab.rb"
+	cat <<EOF >> "$config_path/gitlab.rb"
+# Last chance to fix Gitlab
+package['modify_kernel_parameters'] = false
+EOF
+	ynh_store_file_checksum --file="$config_path/gitlab.rb"
+}

scripts/upgrade.d/upgrade.last.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
-gitlab_version="14.1.0"
+gitlab_version="14.1.1"
 
 # sha256sum found here: https://packages.gitlab.com/gitlab
 gitlab_debian_version="buster"
 
-gitlab_x86_64_buster_source_sha256="4a3a7c4eb7bb07df1052e20a68134071b43ea57b563906af390785c200ec1f77"
+gitlab_x86_64_buster_source_sha256="f7a45a4b035a0ee6ebcd4330d29749d6be2819f09cf07e2fd63eec7d34e3b586"
 
-gitlab_arm64_buster_source_sha256="543569641dc3629dfff2c0c913b23acfc2b4a567e2e846c8b0ee8c62e6f7905b"
+gitlab_arm64_buster_source_sha256="2c46fea02a06528d7cf9afa8fbef7c16a82e065a299e49ee7b32f6783299852e"
 
-gitlab_arm_buster_source_sha256="25491d5df45ad0f34771eca120ca7b01ab8e606f0915ec7a7e5f4d3a76d4f4a9"
+gitlab_arm_buster_source_sha256="1650b646305fd3e5a0a9d6ac48ea378f06b3e40a2b948103ec567490a25e62e0"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)
 
@@ -20,8 +20,8 @@ elif [ "$architecture" = "arm64" ]; then
 elif [ "$architecture" = "arm" ]; then
 	# If the version for arm doesn't exist, then use an older one
 	if [ -z "$gitlab_arm_buster_source_sha256" ]; then
-		gitlab_version="14.1.0"
-		gitlab_arm_buster_source_sha256="25491d5df45ad0f34771eca120ca7b01ab8e606f0915ec7a7e5f4d3a76d4f4a9"
+		gitlab_version="14.1.1"
+		gitlab_arm_buster_source_sha256="1650b646305fd3e5a0a9d6ac48ea378f06b3e40a2b948103ec567490a25e62e0"
 	fi
 	gitlab_source_sha256=$gitlab_arm_buster_source_sha256
 fi