From f182cc366caedad420fa89e46438d97c25bd3eaa Mon Sep 17 00:00:00 2001
From: racingninja <rakeshmuraly93@gmail.com>
Date: Thu, 21 Aug 2025 11:56:12 -0700
Subject: [PATCH] Revert "cleanup workflows"

---
 .github/workflows/publish-docker.yaml         | 43 -------------------
 ...blish-test-pypi.yaml => publish-test.yaml} |  0
 .../{publish-pypi.yaml => publish.yaml}       | 25 ++++++++++-
 pyproject.toml                                |  2 +-
 4 files changed, 25 insertions(+), 45 deletions(-)
 delete mode 100644 .github/workflows/publish-docker.yaml
 rename .github/workflows/{publish-test-pypi.yaml => publish-test.yaml} (100%)
 rename .github/workflows/{publish-pypi.yaml => publish.yaml} (57%)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
deleted file mode 100644
index 34e93aa..0000000
--- a/.github/workflows/publish-docker.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Publish Docker image
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  publish-docker:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          # list of Docker images to use as base name for tags
-          images: |
-            expediagroup/expedia-travel-recommendations-mcp
-          # Generate Docker tags based on the following events/attributes
-          tags: |
-            type=ref,event=tag
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3 
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/publish-test-pypi.yaml b/.github/workflows/publish-test.yaml
similarity index 100%
rename from .github/workflows/publish-test-pypi.yaml
rename to .github/workflows/publish-test.yaml
diff --git a/.github/workflows/publish-pypi.yaml b/.github/workflows/publish.yaml
similarity index 57%
rename from .github/workflows/publish-pypi.yaml
rename to .github/workflows/publish.yaml
index 85867cc..e14c9c0 100644
--- a/.github/workflows/publish-pypi.yaml
+++ b/.github/workflows/publish.yaml
@@ -1,5 +1,10 @@
 name: Publish to PyPI and Docker Hub
 
+on:
+  push:
+    tags:
+      - 'v*'  # Triggers only on version tags like v1.0.0
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -42,4 +47,22 @@ jobs:
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          verbose: true
\ No newline at end of file
+          verbose: true
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: Build and push Docker image
+        run: |
+          IMAGE=${{ secrets.DOCKER_HUB_USERNAME }}/expedia-travel-recommendations-mcp
+          VERSION=${GITHUB_REF#refs/tags/v}
+
+          # Build and tag with version and latest
+          docker build -t $IMAGE:$VERSION -t $IMAGE:latest .
+
+          # Push both tags
+          docker push $IMAGE:$VERSION
+          docker push $IMAGE:latest
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index e3bd867..8ba450f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "expedia-travel-recommendations-mcp"
-version = "0.1.9"
+version = "0.1.8"
 description = "Travel recommendations MCP Server"
 readme = "README.md"
 license = { file = "LICENSE" }