diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml index 0102c6d..9b33120 100644 --- a/.github/workflows/build-and-push-docker-image.yml +++ b/.github/workflows/build-and-push-docker-image.yml @@ -24,7 +24,6 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and Push Images - if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true) uses: docker/build-push-action@v5 with: context: . diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml index 52e0808..8380e42 100644 --- a/.github/workflows/prod-deploy.yml +++ b/.github/workflows/prod-deploy.yml @@ -13,6 +13,7 @@ permissions: read-all jobs: build: name: Deploy Shopify Tracker Image on production + if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true) runs-on: ubuntu-latest steps: @@ -34,8 +35,6 @@ jobs: echo "::set-output name=version::$VERSION" - name: Build Shopify Tracker Docker Image - # Only merged pull requests must trigger - if: github.event.pull_request.merged == true uses: ./.github/workflows/build-and-push-docker-image.yml with: img_tag: rudder-shopify-tracker:${{steps.get-version.outputs.version}} diff --git a/CHANGELOG.md b/CHANGELOG.md index f73a3be..f99d13b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.2.2](https://github.com/rudderlabs/rudder-shopify-tracker/compare/v1.2.1...v1.2.2) (2023-09-26) + + +### Bug Fixes + +* prod deploy condition ([#58](https://github.com/rudderlabs/rudder-shopify-tracker/issues/58)) ([5d8bffc](https://github.com/rudderlabs/rudder-shopify-tracker/commit/5d8bffc9a5d4b9d82a6c43c1aea6a723f523b298)) + ### [1.2.1](https://github.com/rudderlabs/rudder-shopify-tracker/compare/v1.2.0...v1.2.1) (2023-09-26) diff --git a/package-lock.json b/package-lock.json index 0fefe64..63084fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rudderstack-shopify-tracker", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rudderstack-shopify-tracker", - "version": "1.2.1", + "version": "1.2.2", "license": "ISC", "dependencies": { "axios": "^0.24.0", diff --git a/package.json b/package.json index ad42a5b..65e3397 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rudderstack-shopify-tracker", - "version": "1.2.1", + "version": "1.2.2", "description": "Tracks client-side events on Shopify stores", "main": "main.js", "scripts": {