From 79cdd999b100157b0ac56b24da78622fcdd03a54 Mon Sep 17 00:00:00 2001 From: Joe Ayoub <45374896+joe-ayoub-segment@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:01:30 +0100 Subject: [PATCH] Publish from release branch (#1973) * minor update to an Action Destination * updating publish to allow from release branch * updating * Publish - @segment/action-destinations@3.256.0 --- .github/workflows/publish.yml | 1 + lerna.json | 2 +- packages/destination-actions/package.json | 2 +- packages/destination-actions/src/destinations/1plusx/index.ts | 2 +- scripts/release.sh | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7407e233c8..263d604f41 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,6 +7,7 @@ on: push: branches: - main + - release jobs: build-and-publish: diff --git a/lerna.json b/lerna.json index 8c3c8d6092..959ff925a2 100644 --- a/lerna.json +++ b/lerna.json @@ -8,7 +8,7 @@ "npmClientArgs": ["--ignore-engines", "--ignore-optional"] }, "version": { - "allowBranch": "main" + "allowBranch": ["main", "release"] } } } diff --git a/packages/destination-actions/package.json b/packages/destination-actions/package.json index 0b1be16626..69688eb388 100644 --- a/packages/destination-actions/package.json +++ b/packages/destination-actions/package.json @@ -1,7 +1,7 @@ { "name": "@segment/action-destinations", "description": "Destination Actions engine and definitions.", - "version": "3.255.0", + "version": "3.256.0", "repository": { "type": "git", "url": "https://github.com/segmentio/action-destinations", diff --git a/packages/destination-actions/src/destinations/1plusx/index.ts b/packages/destination-actions/src/destinations/1plusx/index.ts index ce49f6b458..977f450fdf 100644 --- a/packages/destination-actions/src/destinations/1plusx/index.ts +++ b/packages/destination-actions/src/destinations/1plusx/index.ts @@ -8,7 +8,7 @@ const destination: DestinationDefinition = { name: '1plusX', slug: 'actions-1plusx', mode: 'cloud', - //No authentication required for 1plusX Data Collection API + // No authentication required for 1plusX Data Collection API authentication: { scheme: 'custom', fields: { diff --git a/scripts/release.sh b/scripts/release.sh index b676e4d5d0..35b688f95f 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,9 +1,9 @@ #!/bin/bash branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD); -if [[ $branch != "main" ]]; +if [[ $branch != "main" && $branch != "release" ]]; then - echo "You must be on the main branch to release" + echo "You must be on the main or relesase branch to release" exit fi;