Skip to content

Commit

Permalink
[github] Update default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
brentvatne committed Jan 26, 2022
1 parent 168ee43 commit 4684304
Show file tree
Hide file tree
Showing 21 changed files with 36 additions and 125 deletions.
89 changes: 0 additions & 89 deletions .github/ISSUE_TEMPLATE/release.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/android-instrumentation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Android Instrumentation Tests
on:
workflow_dispatch: {}
push:
branches: [master]
branches: [main]
paths:
- .github/workflows/android-instrumentation-tests.yml
- 'fastlane/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Android Unit Tests
on:
workflow_dispatch: {}
push:
branches: [master]
branches: [main]
paths:
- .github/workflows/android-unit-tests.yml
- android/**
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CLI

on:
push:
branches: [master, 'sdk-*']
branches: [main, 'sdk-*']
paths:
- .github/workflows/cli.yml
- packages/**
Expand All @@ -28,7 +28,7 @@ jobs:
with:
fetch-depth: 100
- name: ⬇️ Fetch commits from base branch
run: git fetch origin ${{ github.event.before || github.base_ref || 'master' }}:${{ github.event.before || github.base_ref || 'master' }} --depth 100
run: git fetch origin ${{ github.event.before || github.base_ref || 'main' }}:${{ github.event.before || github.base_ref || 'main' }} --depth 100
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
- name: ♻️ Restore workspace node modules
uses: actions/cache@v2
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
working-directory: packages/expo
# - name: 🔔 Notify on Slack
# uses: 8398a7/action-slack@v3
# if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
# if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_api }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/client-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- .ruby-version
- yarn.lock
push:
branches: [master, sdk-*]
branches: [main, sdk-*]
paths:
- .github/workflows/client-android.yml
- secrets/**
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
SUPPLY_JSON_KEY_DATA: ${{ secrets.SUPPLY_JSON_KEY_DATA }}
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_android }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/client-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
- .ruby-version
- yarn.lock
push:
branches: [master, sdk-*]
branches: [main, sdk-*]
paths:
- .github/workflows/client-ios.yml
- ios/**
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
EXPO_VERSIONS_SECRET: ${{ secrets.EXPO_VERSIONS_SECRET }}
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_ios }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
description: 'Number of the pull request to review'
required: true
pull_request_target:
branches: [master, sdk-*]
branches: [main, sdk-*]

concurrency:
group: ${{ github.workflow }}-${{ github.event.inputs.pullNumber || github.event.number }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/development-client-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- .github/workflows/development-client-e2e.yml
- packages/expo-dev-*/**
push:
branches: [master]
branches: [main]
paths:
- .github/workflows/development-client-e2e.yml
- packages/expo-dev-*/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/development-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
# - .github/workflows/development-client.yml
# - packages/expo-dev-*/**
# push:
# branches: [master]
# branches: [main]
# paths:
# - .github/workflows/development-client.yml
# - packages/expo-dev-*/**
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ defaults:
on:
workflow_dispatch: {}
push:
branches: [master]
branches: [main]
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
Expand Down Expand Up @@ -77,13 +77,13 @@ jobs:
yarn test-links http://127.0.0.1:8000
timeout-minutes: 1
- run: ./deploy.sh
if: ${{ github.event.ref == 'refs/heads/master' }}
if: ${{ github.event.ref == 'refs/heads/main' }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && github.event.ref == 'refs/heads/master'
if: failure() && github.event.ref == 'refs/heads/main'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_docs }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dogfooding-clients.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
path: ~/.gradle/daemon
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_android }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/expotools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Expotools
on:
workflow_dispatch: {}
push:
branches: [master, 'sdk-*']
branches: [main, 'sdk-*']
paths:
- .github/workflows/expotools.yml
- tools/**
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/home.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- home/**
- yarn.lock
push:
branches: [master, 'sdk-*']
branches: [main, 'sdk-*']
paths:
- .github/workflows/home.yml
- home/**
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
working-directory: home
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_api }}
Expand All @@ -57,7 +57,7 @@ jobs:
author_name: Home app

publish-dogfood-home:
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
needs: build
runs-on: ubuntu-18.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- Gemfile.lock
- .ruby-version
push:
branches: [master]
branches: [main]
paths:
- .github/workflows/ios-unit-tests.yml
- ios/**
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/native-component-list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- packages/**
- yarn.lock
push:
branches: [master]
branches: [main]
paths:
- .github/workflows/native-component-list.yml
- apps/native-component-list/**
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
working-directory: apps/native-component-list
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master')
if: failure() && (github.event.ref == 'refs/heads/main')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_api }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch: {}
push:
branches:
- master
- main
paths:
- .github/workflows/web.yml
- yarn.lock
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
required: false
default: ''
push:
branches: [master, 'sdk-*']
branches: [main, 'sdk-*']
paths:
- .github/workflows/sdk.yml
- tools/**
Expand Down Expand Up @@ -36,7 +36,7 @@ jobs:
with:
fetch-depth: 100
- name: ⬇️ Fetch commits from base branch
run: git fetch origin ${{ github.event.before || github.base_ref || 'master' }}:${{ github.event.before || github.base_ref || 'master' }} --depth 100
run: git fetch origin ${{ github.event.before || github.base_ref || 'main' }}:${{ github.event.before || github.base_ref || 'main' }} --depth 100
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
- name: ♻️ Restore workspace node modules
uses: actions/cache@v2
Expand Down Expand Up @@ -69,11 +69,11 @@ jobs:
else
# On push event check packages changed since previous remote head.
# In pull requests and workflow_dispatch events check all packages changed in the entire PR.
bin/expotools check-packages --since ${{ github.event.before || github.base_ref || 'master' }}
bin/expotools check-packages --since ${{ github.event.before || github.base_ref || 'main' }}
fi
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_api }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shell-app-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ jobs:
run: |
aws s3 cp --acl public-read ${{ steps.tarball.outputs.filename }} s3://exp-artifacts
echo "Release tarball uploaded to s3://exp-artifacts/${{ steps.tarball.outputs.filename }}"
echo "You can deploy this by updating or creating a new file in https://github.com/expo/turtle/tree/master/shellTarballs/ios"
echo "You can deploy this by updating or creating a new file in https://github.com/expo/turtle/tree/main/shellTarballs/ios"
echo "Then follow the deployment instructions: https://github.com/expo/turtle-deploy"
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-') || github.event_name == 'schedule')
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-') || github.event_name == 'schedule')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_IOS }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-suite-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Suite Lint
on:
workflow_dispatch: {}
push:
branches: [master]
branches: [main]
paths:
- apps/test-suite/**
pull_request:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test Suite
on:
workflow_dispatch: {}
push:
branches: [master, 'sdk-*']
branches: [main, 'sdk-*']
paths:
- .github/workflows/test-suite.yml
- apps/bare-expo/**
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
working-directory: apps/bare-expo
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_web }}
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
path: apps/bare-expo/artifacts
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_ios }}
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
path: apps/bare-expo/artifacts
- name: 🔔 Notify on Slack
uses: 8398a7/action-slack@v3
if: failure() && (github.event.ref == 'refs/heads/master' || startsWith(github.event.ref, 'refs/heads/sdk-'))
if: failure() && (github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_android }}
Expand Down
Loading

0 comments on commit 4684304

Please sign in to comment.