Merge branch 'release' into 'master'

Release See merge request passbolt/passbolt-browser-extension!540
passbolt · Jun 6, 2023 · 3365425 · 3365425
2 parents 0ebca83 + c5cb78b
commit 3365425
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/.gitlab-ci/jobs/review.yml b/.gitlab-ci/jobs/review.yml
@@ -11,14 +11,14 @@ review-chrome:
       bash ./.gitlab-ci/scripts/bin/slack-status-messages.sh ":airplane_departure: passbolt-chrome-extension $CI_COMMIT_TAG has been sent to review!" "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"
 
 review-firefox:
-  stage: publish
+  stage: review
   rules:
     - if: "$CI_COMMIT_TAG"
   script:
     - bash .gitlab-ci/scripts/bin/review.sh firefox
 
 review-edge:
-  stage: publish
+  stage: review
   rules:
     - if: "$CI_COMMIT_TAG"
   script:

diff --git a/.gitlab-ci/scripts/bin/publish.sh b/.gitlab-ci/scripts/bin/publish.sh
@@ -28,7 +28,6 @@ function send_to_chrome() {
     -H "x-goog-api-version: 2" \
     -H "Content-Length: 0" \
     -X POST \
-    -v \
     https://www.googleapis.com/chromewebstore/v1.1/items/"$id"/publish
 }
 

diff --git a/.gitlab-ci/scripts/bin/review.sh b/.gitlab-ci/scripts/bin/review.sh
@@ -17,8 +17,7 @@ function send_to_chrome() {
     -H "Authorization: Bearer $token"  \
     -H "x-goog-api-version: 2" \
     -X PUT \
-    -T "$FILE_NAME" \
-    -v \
+    -T "dist/chrome/passbolt-${CI_COMMIT_TAG#v}.zip" \
     https://www.googleapis.com/upload/chromewebstore/v1.1/items/"$id"
 }
 

diff --git a/.gitlab-ci/scripts/lib/version-check.sh b/.gitlab-ci/scripts/lib/version-check.sh
@@ -22,5 +22,4 @@ function validate_config_version_and_api_tag () {
     echo "Version number in version.php does not match the tag: $PASSBOLT_VERSION"
     return 1
   fi
-}
-
+}