Merge branch 'feature/PB-36641_52-Publish-production-API' into 'master'

PB-36641 Merge release into master (v4.10.0)

See merge request passbolt/passbolt-ce-api!313

.editorconfig

@@ -19,6 +19,9 @@ indent_size = 2
 [*.json]
 indent_size = 2
 
+[composer.json]
+indent_size = 4
+
 [*.yml]
 indent_size = 2
 

.gitlab-ci.yml

@@ -22,13 +22,11 @@ stages:
 
 include:
   - template: Code-Quality.gitlab-ci.yml
-  # - local: "/.gitlab-ci/jobs/php_unit_tests/runner.yml"
   - local: "/.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml"
   - local: "/.gitlab-ci/jobs/style_check.yml"
   - local: "/.gitlab-ci/jobs/security_check.yml"
   - local: ".gitlab-ci/jobs/packaging_trigger/package_trigger.yml"
   - local: ".gitlab-ci/jobs/release.yml"
-  - local: ".gitlab-ci/jobs/help_site_notes.yml"
 
 code_quality:
   image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.12-dind

.gitlab-ci/jobs/packaging_trigger/package_trigger.yml

@@ -1,12 +1,29 @@
+tag-cleaner:
+  stage: packaging-trigger
+  script:    
+  - | 
+      source .gitlab-ci/scripts/lib/tag-cleaner.sh $CI_COMMIT_TAG
+      echo "PB_VERSION=$PB_VERSION" >> tag.env
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: on_success  
+  artifacts:
+    reports:
+      dotenv: tag.env
+
 packaging-trigger:
   stage: packaging-trigger
   variables:
     PACKAGING_TRIGGER_BRANCH: "main"
-    DOWNSTREAM_PROJECT_ID: "$PACKAGING_PROJECT_ID"
-  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm-slim
-  script:
-    - apt update && apt install -y curl
-    - bash .gitlab-ci/scripts/bin/packaging-trigger.sh "$CI_COMMIT_TAG" "$PACKAGING_TRIGGER_BRANCH"
+    PASSBOLT_FLAVOUR: $PASSBOLT_FLAVOUR
+    PASSBOLT_VERSION: $PB_VERSION
+    PASSBOLT_BRANCH: $CI_COMMIT_TAG
+  trigger:
+    project: passbolt/passbolt-ops/passbolt-packaging
+    branch: $PACKAGING_TRIGGER_BRANCH
   rules:
     - if: $CI_COMMIT_TAG
       when: on_success
+  needs:
+    - job: tag-cleaner
+      artifacts: true

.gitlab-ci/scripts/bin/packaging-trigger.sh → .gitlab-ci/scripts/lib/tag-cleaner.sh

@@ -1,11 +1,11 @@
+
 #!/bin/bash
 
 # This script receives an passbolt tag and returns the passbolt version semver compliant (without 'v')
 # It can handle stable versions eg. v3.11.0 -> 3.11.0
 # and release candiate versions eg. v3.11.0-rc.1 -> 3.11.0-rc.1
 
 tag="$1"
-branch="$2"
 
 function is_release_candidate () {
   local version=$1
@@ -57,13 +57,4 @@ fi
 echo "Creating the following variables"
 echo "================================="
 echo "PASSBOLT_VERSION=${version}"
-
-passbolt_version="${version}"
-
-curl -X POST \
-     -F token="$PACKAGING_TOKEN" \
-     -F "ref=$branch" \
-     -F "variables[PASSBOLT_FLAVOUR]=$PASSBOLT_FLAVOUR" \
-     -F "variables[PASSBOLT_VERSION]=$passbolt_version" \
-     -F "variables[PASSBOLT_BRANCH]=$tag" \
-     "https://gitlab.com/api/v4/projects/$DOWNSTREAM_PROJECT_ID/trigger/pipeline"
+export PB_VERSION=${version}