Skip to content

Commit

Permalink
Merge pull request #59 from rudderlabs/hotfix-release/v1.2.2
Browse files Browse the repository at this point in the history
chore(release): pull hotfix-release/v1.2.2 into main
  • Loading branch information
saikumarrs authored Sep 26, 2023
2 parents 6e04ba2 + 502494c commit a6bb286
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-and-push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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}}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit a6bb286

Please sign in to comment.