Skip to content
Snippets Groups Projects
Commit 6d8a008f authored by Pieter van Staden's avatar Pieter van Staden
Browse files

INFRASTRUCTURE :: Update the check to make sure the tag is created from the prod branch

parent 4e3096b8
No related branches found
No related tags found
1 merge request!26INFRASTRUCTURE :: Update the check to make sure the tag is created from the prod branch
Pipeline #75158 failed
...@@ -33,17 +33,10 @@ tag_deploy: ...@@ -33,17 +33,10 @@ tag_deploy:
- AWS_SECRET_ACCESS_KEY=$(eval echo -e "\$$AWS_SECRET_ACCESS_KEY_KEY") - AWS_SECRET_ACCESS_KEY=$(eval echo -e "\$$AWS_SECRET_ACCESS_KEY_KEY")
- export AWS_ACCESS_KEY_ID - export AWS_ACCESS_KEY_ID
- export AWS_SECRET_ACCESS_KEY - export AWS_SECRET_ACCESS_KEY
# Fetch the prod branch
- git fetch origin prod - git fetch origin prod
# Get the current branch or tag pointing ref
- TAG_BRANCH=$(git for-each-ref --format='%(refname:short)' --contains $CI_COMMIT_SHA refs/heads/ | grep "^prod$" || echo "") - TAG_BRANCH=$(git for-each-ref --format='%(refname:short)' --contains $CI_COMMIT_SHA refs/heads/ | grep "^prod$" || echo "")
- echo "Current branches containing this commit: $(git for-each-ref --format='%(refname:short)' --contains $CI_COMMIT_SHA refs/heads/)" - echo "Current branches containing this commit: $(git for-each-ref --format='%(refname:short)' --contains $CI_COMMIT_SHA refs/heads/)"
- if [ -z "$TAG_BRANCH" ]; then - if [ -z "$TAG_BRANCH" ]; then echo "Tag ${CI_COMMIT_TAG} was not created on the prod branch."; exit 1; else echo "Tag ${CI_COMMIT_TAG} was created on the prod branch."; fi
echo "Tag ${CI_COMMIT_TAG} was not created on the prod branch.";
exit 1;
else
echo "Tag ${CI_COMMIT_TAG} was created on the prod branch.";
fi
script: script:
- "TAG_ARCHIVE_URL=https://gitlab.bob.co.za/bob-public-utils/bobgo-magento-extension/-/archive/${CI_COMMIT_TAG}/bobgo-magento-extension-${CI_COMMIT_TAG}.zip" - "TAG_ARCHIVE_URL=https://gitlab.bob.co.za/bob-public-utils/bobgo-magento-extension/-/archive/${CI_COMMIT_TAG}/bobgo-magento-extension-${CI_COMMIT_TAG}.zip"
- curl -o bobgo-magento-extension-${CI_COMMIT_TAG}.zip "$TAG_ARCHIVE_URL" - curl -o bobgo-magento-extension-${CI_COMMIT_TAG}.zip "$TAG_ARCHIVE_URL"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "bobgo/bobgo-magento-extension", "name": "bobgo/bobgo-magento-extension",
"description": "Smart shipping and order management solution in South Africa", "description": "Smart shipping and order management solution in South Africa",
"type": "magento2-module", "type": "magento2-module",
"version": "1.0.53", "version": "1.0.54",
"authors": [ "authors": [
{ {
"name": "Bob Go", "name": "Bob Go",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
--> -->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="BobGroup_BobGo" setup_version="1.0.53"> <module name="BobGroup_BobGo" setup_version="1.0.54">
<sequence> <sequence>
<module name="Magento_Webapi"/> <module name="Magento_Webapi"/>
<module name="Magento_Catalog"/> <module name="Magento_Catalog"/>
......
{ {
"name": "bobgo-magento-plugin", "name": "bobgo-magento-plugin",
"description": "Bob Go magento plugin", "description": "Bob Go magento plugin",
"version": "1.0.53", "version": "1.0.54",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"scripts": { "scripts": {
"prepare": "husky install", "prepare": "husky install",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment