Skip to content

Commit

Permalink
user master instead of trunk branch name
Browse files Browse the repository at this point in the history
  • Loading branch information
matiasbenedetto committed Oct 10, 2024
1 parent 90208ec commit dcb3811
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
types: [closed]
branches:
- trunk
- master

jobs:
deploy-to-wordpress:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-new-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion update-version-and-changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit dcb3811

Please sign in to comment.