Merge branch 'dev' into 'prod'

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

See merge request !25

.gitlab-ci.yml

@@ -33,9 +33,15 @@ tag_deploy:
     - AWS_SECRET_ACCESS_KEY=$(eval echo -e "\$$AWS_SECRET_ACCESS_KEY_KEY")
     - export AWS_ACCESS_KEY_ID
     - export AWS_SECRET_ACCESS_KEY
+    # Fetch the prod branch
     - git fetch origin prod
-    - COMMIT_BRANCH=$(git branch -r --contains $CI_COMMIT_SHA | grep "origin/prod" || echo "")
-    - if [ -z "$COMMIT_BRANCH" ]; then echo "Tag was not created from prod branch. Skipping deployment."; exit 1; fi
+    # Check if the tagged commit is from the prod branch using merge-base
+    - if git merge-base --is-ancestor "${CI_COMMIT_SHA}" origin/prod; then
+      echo "Tag ${CI_COMMIT_TAG} is from the prod branch.";
+      else
+      echo "Tag ${CI_COMMIT_TAG} is not from the prod branch.";
+      exit 1;
+      fi
   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"
     - curl -o bobgo-magento-extension-${CI_COMMIT_TAG}.zip "$TAG_ARCHIVE_URL"

composer.json

@@ -2,7 +2,7 @@
     "name": "bobgo/bobgo-magento-extension",
     "description": "Smart shipping and order management solution in South Africa",
     "type": "magento2-module",
-    "version": "1.0.51",
+    "version": "1.0.52",
     "authors": [
         {
             "name": "Bob Go",

etc/module.xml

@@ -7,7 +7,7 @@
  */
 -->
 <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.51">
+    <module name="BobGroup_BobGo" setup_version="1.0.52">
         <sequence>
             <module name="Magento_Webapi"/>
             <module name="Magento_Catalog"/>

package.json

 {
   "name": "bobgo-magento-plugin",
   "description": "Bob Go magento plugin",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "license": "GPL-2.0-or-later",
   "scripts": {
     "prepare": "husky install",