Skip to content

Internal: Update master to main branch [TMZ-806] #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hein-obox merged 1 commit into from
Aug 5, 2025
Merged

Internal: Update master to main branch [TMZ-806] #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/config/release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"repository": {
"name": "hello-elementor",
"owner": "elementor",
"main_branch": "master",
"main_branch": "main",
"release_branches": ["3.4"]
},
"versioning": {
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/sync-branches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ PACKAGE_VERSION=$(node -p "require('./package.json').version")
NEXT_PACKAGE_VERSION=$(npx semver $PACKAGE_VERSION -i minor)
NEXT_RELEASE_BRANCH="release/${NEXT_PACKAGE_VERSION}"

# Merge master -> develop
# Merge main -> develop
git checkout develop
git merge origin/master
git merge origin/main
git push origin develop

# Merge develop -> next release
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-beta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
outputs:
prev_version: ${{ steps.bump_version_step.outputs.prev_version }}
steps:
- name: Checkout master branch
- name: Checkout main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
ref: main
- name: Get release branch
run: |
bash "${GITHUB_WORKSPACE}/.github/scripts/get-release-branch-name.sh"
Expand Down Expand Up @@ -48,11 +48,11 @@ jobs:
needs: bump-version
runs-on: ubuntu-16.04
steps:
- name: Checkout master branch
- name: Checkout main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
ref: main
- name: Get release branch
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish-patch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ jobs:
needs: bump-version
runs-on: ubuntu-20.04
steps:
- name: Checkout master branch
- name: Checkout main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
- name: Merge develop -> master
ref: main
- name: Merge develop -> main
uses: devmasx/merge-branch@a1752b9ba42bb417ec19be7dc974e2faf77d3ef2 # v1.3.1
with:
type: now
from_branch: develop
target_branch: master
target_branch: main
github_token: ${{ secrets.MAINTAIN_TOKEN }}
- name: Checkout updated master branch
- name: Checkout updated main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
ref: main
- name: Install Dependencies
run: |
PACKAGE_VERSION=$(node -p "require('./package.json').version")
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
if: (github.actor == 'ronkelementor' || github.actor == 'KingYes') && startsWith(github.repository, 'elementor/')
runs-on: ubuntu-20.04
steps:
- name: Checkout master branch
- name: Checkout main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
ref: main
- name: Get release branch
env:
INPUT_VERSION: ${{ github.event.inputs.version }}
Expand Down Expand Up @@ -78,23 +78,23 @@ jobs:
needs: bump-version
runs-on: ubuntu-16.04
steps:
- name: Checkout master branch
- name: Checkout main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
- name: Merge develop -> master
ref: main
- name: Merge develop -> main
uses: devmasx/merge-branch@a1752b9ba42bb417ec19be7dc974e2faf77d3ef2 # v1.3.1
with:
type: now
from_branch: develop
target_branch: master
target_branch: main
github_token: ${{ secrets.MAINTAIN_TOKEN }}
- name: Checkout updated master branch
- name: Checkout updated main branch
uses: actions/checkout@v2
with:
token: ${{ secrets.MAINTAIN_TOKEN }}
ref: master
ref: main
- name: Install Dependencies
run: |
PACKAGE_VERSION=$(node -p "require('./package.json').version")
Expand Down
Loading