diff --git a/.github/workflows/ci-standard-checks.yml b/.github/workflows/ci-standard-checks.yml index 2162889856..7265b1f82a 100644 --- a/.github/workflows/ci-standard-checks.yml +++ b/.github/workflows/ci-standard-checks.yml @@ -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: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 19bee71748..607028a107 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - develop + - main pull_request: branches: - - develop + - main env: PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1 @@ -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/cancel-workflow-action@0.6.0 with: @@ -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 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e5f16e7afc..816ce8a010 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy on: workflow_run: workflows: ['CI'] - branches: [develop] + branches: [main] types: - completed @@ -15,7 +15,6 @@ jobs: if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: [ubuntu-latest] steps: - - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.6.0 with: @@ -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: | @@ -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 diff --git a/package.json b/package.json index 82b81375df..210e63a47e 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ ], "release": { "branches": [ - "develop" + "main" ] } }