diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index d2c89ab2..1f7f4465 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -3,7 +3,7 @@ name: Production deployment on: push: branches: - - main + - master env: NEXT_TELEMETRY_DISABLED: 1 @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: 'main' + ref: 'master' - uses: amondnet/vercel-action@v25.1.1 with: vercel-token: ${{ secrets.VERCEL_TOKEN }} diff --git a/.github/workflows/sync-master.yml b/.github/workflows/sync-master.yml deleted file mode 100644 index 894e64b4..00000000 --- a/.github/workflows/sync-master.yml +++ /dev/null @@ -1,22 +0,0 @@ -# Now that we're deploying changes directly to master we need -# to make sure staging is kept up to date. This action merges master in to staging -# when we deploy a change to master. - -name: Sync multiple branches -on: - push: - branches: - - master -jobs: - sync-branch: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@master - - - name: Merge master -> staging - uses: devmasx/merge-branch@v1.3.1 - with: - type: now - from_branch: master - target_branch: staging - github_token: ${{ github.token }}