diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 085c9dc032..d3264e6316 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: push: branches: - main - - release + - hotfix/* jobs: build-and-publish: @@ -48,9 +48,9 @@ jobs: npm set '//registry.npmjs.org/:_authToken' ${{ secrets.NPM_PUBLISH_TOKEN }} npm whoami - - name: Publish - run: | - yarn lerna publish from-package --yes --allowBranch=main --loglevel=verbose --dist-tag latest + # - name: Publish + # run: | + # yarn lerna publish from-package --yes --allowBranch=main --loglevel=verbose --dist-tag latest release: needs: build-and-publish # comment when testing locally with https://github.com/nektos/act diff --git a/.github/workflows/version-packages.yml b/.github/workflows/version-packages.yml index 736a76453a..5eb34b8c8b 100644 --- a/.github/workflows/version-packages.yml +++ b/.github/workflows/version-packages.yml @@ -12,10 +12,6 @@ on: description: 'Base branch to create PR to' required: true default: 'main' - type: choice - options: - - main - - release run_id: description: 'Unique identifier for the run' required: false @@ -67,7 +63,13 @@ jobs: run: NODE_ENV=production yarn build - name: Version Packages - run: yarn lerna version minor --yes --allow-branch ${{ github.event.inputs.branch }} --no-git-tag-version --no-commit-hooks --no-private + run: | + # minor version bump for main branch and patch for hotfixes + if [ "${{ github.event.inputs.base_branch }}" == "main" ]; then + yarn lerna version minor --yes --allow-branch ${{ github.event.inputs.branch }} --no-git-tag-version --no-commit-hooks --no-private + else + yarn lerna version patch --yes --allow-branch ${{ github.event.inputs.branch }} --no-git-tag-version --no-commit-hooks --no-private + fi - name: Commit and push id: commit_and_push diff --git a/packages/destination-actions/src/destinations/braze/trackEvent2/index.ts b/packages/destination-actions/src/destinations/braze/trackEvent2/index.ts index 7752d9c74d..09c96c663a 100644 --- a/packages/destination-actions/src/destinations/braze/trackEvent2/index.ts +++ b/packages/destination-actions/src/destinations/braze/trackEvent2/index.ts @@ -108,7 +108,7 @@ const action: ActionDefinition = { if (syncMode === 'add' || syncMode === 'update') { return sendTrackEvent(request, settings, payload, syncMode) } - throw new IntegrationError('syncMode must be "add" or "update"', 'Invalid syncMode', 400) + throw new IntegrationError('syncMode should be "add" or "update"', 'Invalid syncMode', 400) }, performBatch: (request, { settings, payload, syncMode }) => { if (syncMode === 'add' || syncMode === 'update') {