Skip to content

Commit

Permalink
Merge branch 'feature/PB-24864' into 'release'
Browse files Browse the repository at this point in the history
PB-24864: make curl not verbose and look for assets in a known location

See merge request passbolt/passbolt-browser-extension!539
  • Loading branch information
Gamabunta57 committed Jun 6, 2023
2 parents 9bfc625 + 67db6e1 commit c5cb78b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci/jobs/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .gitlab-ci/scripts/bin/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 1 addition & 2 deletions .gitlab-ci/scripts/bin/review.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
3 changes: 1 addition & 2 deletions .gitlab-ci/scripts/lib/version-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

}

0 comments on commit c5cb78b

Please sign in to comment.