Skip to content

Commit de42698

Browse files
authored
Merge pull request #30 from Typeform/ENG-567/migrating-default-branch-to-main
[ENG-567] migrating default branch to main
2 parents 5820d10 + 12092cf commit de42698

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

.github/workflows/ci-standard-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: CI Standard Checks
22
on:
33
push:
44
branches:
5-
- develop
5+
- main
66
pull_request:
77
types: [opened, edited, synchronize, reopened]
88
branches:
9-
- develop
9+
- main
1010

1111
jobs:
1212
ci-standard-checks:

.github/workflows/ci.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: CI
33
on:
44
push:
55
branches:
6-
- develop
6+
- main
77
pull_request:
88
branches:
9-
- develop
9+
- main
1010

1111
env:
1212
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
@@ -16,11 +16,19 @@ jobs:
1616
strategy:
1717
max-parallel: 1
1818
matrix:
19-
browser: ["mac-chrome-latest","mac-firefox-latest","mac-safari-latest","windows-chrome-latest","windows-firefox-latest","windows-edge-latest","ios-latest"]
19+
browser:
20+
[
21+
'mac-chrome-latest',
22+
'mac-firefox-latest',
23+
'mac-safari-latest',
24+
'windows-chrome-latest',
25+
'windows-firefox-latest',
26+
'windows-edge-latest',
27+
'ios-latest',
28+
]
2029
name: Build and Test
2130
runs-on: [ubuntu-latest]
2231
steps:
23-
2432
- name: Cancel Previous Runs
2533
uses: styfle/[email protected]
2634
with:
@@ -32,7 +40,7 @@ jobs:
3240
- name: Set up node
3341
uses: actions/setup-node@v1
3442
with:
35-
node-version: '12.x'
43+
node-version: '14.x'
3644

3745
- name: Cache node modules
3846
uses: actions/cache@v2

.github/workflows/deploy.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy
33
on:
44
workflow_run:
55
workflows: ['CI']
6-
branches: [develop]
6+
branches: [main]
77
types:
88
- completed
99

@@ -15,7 +15,6 @@ jobs:
1515
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1616
runs-on: [ubuntu-latest]
1717
steps:
18-
1918
- name: Cancel Previous Runs
2019
uses: styfle/[email protected]
2120
with:
@@ -27,7 +26,7 @@ jobs:
2726
- name: Set up node
2827
uses: actions/setup-node@v1
2928
with:
30-
node-version: '12.x'
29+
node-version: '14.x'
3130

3231
- name: Set GitHub packages registry
3332
run: |
@@ -46,7 +45,7 @@ jobs:
4645
run: npm ci
4746

4847
- name: Deploy
49-
if: contains(github.ref, 'refs/heads/develop')
48+
if: contains(github.ref, 'refs/heads/main')
5049
run: |
5150
npm run build
5251
npm run semantic-release

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
],
172172
"release": {
173173
"branches": [
174-
"develop"
174+
"main"
175175
]
176176
}
177177
}

0 commit comments

Comments
 (0)