Skip to content

Commit

Permalink
Merge pull request #30 from Typeform/ENG-567/migrating-default-branch…
Browse files Browse the repository at this point in the history
…-to-main

[ENG-567] migrating default branch to main
  • Loading branch information
alfrejivi authored Nov 29, 2021
2 parents 5820d10 + 12092cf commit de42698
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-standard-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: CI Standard Checks
on:
push:
branches:
- develop
- main
pull_request:
types: [opened, edited, synchronize, reopened]
branches:
- develop
- main

jobs:
ci-standard-checks:
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CI
on:
push:
branches:
- develop
- main
pull_request:
branches:
- develop
- main

env:
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
Expand All @@ -16,11 +16,19 @@ jobs:
strategy:
max-parallel: 1
matrix:
browser: ["mac-chrome-latest","mac-firefox-latest","mac-safari-latest","windows-chrome-latest","windows-firefox-latest","windows-edge-latest","ios-latest"]
browser:
[
'mac-chrome-latest',
'mac-firefox-latest',
'mac-safari-latest',
'windows-chrome-latest',
'windows-firefox-latest',
'windows-edge-latest',
'ios-latest',
]
name: Build and Test
runs-on: [ubuntu-latest]
steps:

- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
Expand All @@ -32,7 +40,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Cache node modules
uses: actions/cache@v2
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy
on:
workflow_run:
workflows: ['CI']
branches: [develop]
branches: [main]
types:
- completed

Expand All @@ -15,7 +15,6 @@ jobs:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
runs-on: [ubuntu-latest]
steps:

- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
Expand All @@ -27,7 +26,7 @@ jobs:
- name: Set up node
uses: actions/setup-node@v1
with:
node-version: '12.x'
node-version: '14.x'

- name: Set GitHub packages registry
run: |
Expand All @@ -46,7 +45,7 @@ jobs:
run: npm ci

- name: Deploy
if: contains(github.ref, 'refs/heads/develop')
if: contains(github.ref, 'refs/heads/main')
run: |
npm run build
npm run semantic-release
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
],
"release": {
"branches": [
"develop"
"main"
]
}
}

0 comments on commit de42698

Please sign in to comment.