Skip to content

Commit c8994cc

Browse files
authored
Update master to main branch (#516)
1 parent c7ec171 commit c8994cc

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.github/config/release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"repository": {
33
"name": "hello-elementor",
44
"owner": "elementor",
5-
"main_branch": "master",
5+
"main_branch": "main",
66
"release_branches": ["3.4"]
77
},
88
"versioning": {

.github/scripts/sync-branches.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ PACKAGE_VERSION=$(node -p "require('./package.json').version")
88
NEXT_PACKAGE_VERSION=$(npx semver $PACKAGE_VERSION -i minor)
99
NEXT_RELEASE_BRANCH="release/${NEXT_PACKAGE_VERSION}"
1010

11-
# Merge master -> develop
11+
# Merge main -> develop
1212
git checkout develop
13-
git merge origin/master
13+
git merge origin/main
1414
git push origin develop
1515

1616
# Merge develop -> next release

.github/workflows/publish-beta.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
outputs:
1010
prev_version: ${{ steps.bump_version_step.outputs.prev_version }}
1111
steps:
12-
- name: Checkout master branch
12+
- name: Checkout main branch
1313
uses: actions/checkout@v2
1414
with:
1515
token: ${{ secrets.MAINTAIN_TOKEN }}
16-
ref: master
16+
ref: main
1717
- name: Get release branch
1818
run: |
1919
bash "${GITHUB_WORKSPACE}/.github/scripts/get-release-branch-name.sh"
@@ -48,11 +48,11 @@ jobs:
4848
needs: bump-version
4949
runs-on: ubuntu-16.04
5050
steps:
51-
- name: Checkout master branch
51+
- name: Checkout main branch
5252
uses: actions/checkout@v2
5353
with:
5454
token: ${{ secrets.MAINTAIN_TOKEN }}
55-
ref: master
55+
ref: main
5656
- name: Get release branch
5757
env:
5858
INPUT_VERSION: ${{ github.event.inputs.version }}

.github/workflows/publish-patch.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,23 @@ jobs:
5151
needs: bump-version
5252
runs-on: ubuntu-20.04
5353
steps:
54-
- name: Checkout master branch
54+
- name: Checkout main branch
5555
uses: actions/checkout@v2
5656
with:
5757
token: ${{ secrets.MAINTAIN_TOKEN }}
58-
ref: master
59-
- name: Merge develop -> master
58+
ref: main
59+
- name: Merge develop -> main
6060
uses: devmasx/merge-branch@a1752b9ba42bb417ec19be7dc974e2faf77d3ef2 # v1.3.1
6161
with:
6262
type: now
6363
from_branch: develop
64-
target_branch: master
64+
target_branch: main
6565
github_token: ${{ secrets.MAINTAIN_TOKEN }}
66-
- name: Checkout updated master branch
66+
- name: Checkout updated main branch
6767
uses: actions/checkout@v2
6868
with:
6969
token: ${{ secrets.MAINTAIN_TOKEN }}
70-
ref: master
70+
ref: main
7171
- name: Install Dependencies
7272
run: |
7373
PACKAGE_VERSION=$(node -p "require('./package.json').version")

.github/workflows/publish-release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
if: (github.actor == 'ronkelementor' || github.actor == 'KingYes') && startsWith(github.repository, 'elementor/')
1313
runs-on: ubuntu-20.04
1414
steps:
15-
- name: Checkout master branch
15+
- name: Checkout main branch
1616
uses: actions/checkout@v2
1717
with:
1818
token: ${{ secrets.MAINTAIN_TOKEN }}
19-
ref: master
19+
ref: main
2020
- name: Get release branch
2121
env:
2222
INPUT_VERSION: ${{ github.event.inputs.version }}
@@ -78,23 +78,23 @@ jobs:
7878
needs: bump-version
7979
runs-on: ubuntu-16.04
8080
steps:
81-
- name: Checkout master branch
81+
- name: Checkout main branch
8282
uses: actions/checkout@v2
8383
with:
8484
token: ${{ secrets.MAINTAIN_TOKEN }}
85-
ref: master
86-
- name: Merge develop -> master
85+
ref: main
86+
- name: Merge develop -> main
8787
uses: devmasx/merge-branch@a1752b9ba42bb417ec19be7dc974e2faf77d3ef2 # v1.3.1
8888
with:
8989
type: now
9090
from_branch: develop
91-
target_branch: master
91+
target_branch: main
9292
github_token: ${{ secrets.MAINTAIN_TOKEN }}
93-
- name: Checkout updated master branch
93+
- name: Checkout updated main branch
9494
uses: actions/checkout@v2
9595
with:
9696
token: ${{ secrets.MAINTAIN_TOKEN }}
97-
ref: master
97+
ref: main
9898
- name: Install Dependencies
9999
run: |
100100
PACKAGE_VERSION=$(node -p "require('./package.json').version")

0 commit comments

Comments
 (0)