From dcb3811e17fa749128d5f2a71c912abb25623def Mon Sep 17 00:00:00 2001 From: Matias Benedetto Date: Thu, 10 Oct 2024 16:07:30 -0300 Subject: [PATCH] user master instead of trunk branch name --- .github/workflows/deploy.yml | 2 +- .github/workflows/release-new-version.yml | 2 +- update-version-and-changelog.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a688d3..e4d14ba 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,7 +4,7 @@ on: pull_request: types: [closed] branches: - - trunk + - master jobs: deploy-to-wordpress: diff --git a/.github/workflows/release-new-version.yml b/.github/workflows/release-new-version.yml index 502c022..e6f17f8 100644 --- a/.github/workflows/release-new-version.yml +++ b/.github/workflows/release-new-version.yml @@ -61,7 +61,7 @@ jobs: run: | gh pr create \ --title "[Automation] New ${{ github.event.inputs.release_type }} Release: ${{ steps.update-version.outputs.NEW_VERSION }}" \ - --base trunk \ + --base master \ --head ${{ steps.create-branch.outputs.BRANCH_NAME }} \ --label "Release: ${{ github.event.inputs.release_type }}" \ --body " diff --git a/update-version-and-changelog.js b/update-version-and-changelog.js index faf4222..f750be6 100644 --- a/update-version-and-changelog.js +++ b/update-version-and-changelog.js @@ -41,7 +41,7 @@ async function getChangesSinceLastTag() { // To know if there are changes since the last tag. // we are not using getChangesSinceGitTag because it returns the just the merges and not the commits. -// So for example if a hotfix was committed directly to trunk this function will detect it but getChangesSinceGitTag will not. +// So for example if a hotfix was committed directly to master this function will detect it but getChangesSinceGitTag will not. async function getHasChangesSinceGitTag( tag ) { const changes = await git.log( [ `HEAD...${ tag }` ] ); return changes?.all?.length > 0;