diff --git a/mobile/.github/workflows/android.yml b/mobile/.github/workflows/android.yml index be452270b12a..d9698892d253 100644 --- a/mobile/.github/workflows/android.yml +++ b/mobile/.github/workflows/android.yml @@ -3,7 +3,7 @@ name: android on: push: branches: - - master + - main pull_request: jobs: diff --git a/mobile/.github/workflows/artifacts.yml b/mobile/.github/workflows/artifacts.yml index 58f1cea498f7..e5af9cab41ce 100644 --- a/mobile/.github/workflows/artifacts.yml +++ b/mobile/.github/workflows/artifacts.yml @@ -3,13 +3,13 @@ name: artifacts on: push: branches: - - master + - main paths: - VERSION jobs: - master_android_dist: - name: master_android_dist + main_android_dist: + name: main_android_dist runs-on: ubuntu-18.04 timeout-minutes: 120 steps: @@ -28,14 +28,14 @@ jobs: bazel build \ --config=release-android \ --fat_apk_cpu=x86,armeabi-v7a,arm64-v8a \ - --define=pom_version=master-$current_short_commit \ + --define=pom_version=main-$current_short_commit \ //:android_dist - uses: actions/upload-artifact@v1 with: name: envoy_android_aar_sources path: dist/envoy_aar_sources.zip - master_ios_dist: - name: master_ios_dist + main_ios_dist: + name: main_ios_dist runs-on: macOS-latest timeout-minutes: 90 steps: @@ -54,11 +54,11 @@ jobs: with: name: envoy_ios_framework path: dist/ios_artifact - master_ios_cocoapods: - name: master_ios_cocoapods + main_ios_cocoapods: + name: main_ios_cocoapods runs-on: macOS-latest timeout-minutes: 45 - needs: [master_ios_dist] + needs: [main_ios_dist] steps: - uses: actions/checkout@v1 with: diff --git a/mobile/.github/workflows/core.yml b/mobile/.github/workflows/core.yml index c836bdb4575f..cb84ff67d63a 100644 --- a/mobile/.github/workflows/core.yml +++ b/mobile/.github/workflows/core.yml @@ -3,7 +3,7 @@ name: core on: push: branches: - - master + - main pull_request: jobs: diff --git a/mobile/.github/workflows/coverage.yml b/mobile/.github/workflows/coverage.yml index fd5c08de10bd..15ce98c1d1fe 100644 --- a/mobile/.github/workflows/coverage.yml +++ b/mobile/.github/workflows/coverage.yml @@ -3,7 +3,7 @@ name: coverage on: push: branches: - - master + - main pull_request: paths: - 'library/common/**' diff --git a/mobile/.github/workflows/format.yml b/mobile/.github/workflows/format.yml index ab4a82a11111..43b6546817be 100644 --- a/mobile/.github/workflows/format.yml +++ b/mobile/.github/workflows/format.yml @@ -3,7 +3,7 @@ name: format on: push: branches: - - master + - main pull_request: jobs: diff --git a/mobile/.github/workflows/ios.yml b/mobile/.github/workflows/ios.yml index 1d7c07d46935..3b1e6eedc3a6 100644 --- a/mobile/.github/workflows/ios.yml +++ b/mobile/.github/workflows/ios.yml @@ -3,7 +3,7 @@ name: ios on: push: branches: - - master + - main pull_request: jobs: diff --git a/mobile/.github/workflows/perf.yml b/mobile/.github/workflows/perf.yml index 407dc936e1a4..96c80044e39c 100644 --- a/mobile/.github/workflows/perf.yml +++ b/mobile/.github/workflows/perf.yml @@ -3,7 +3,7 @@ name: perf on: push: branches: - - master + - main pull_request: jobs: @@ -27,8 +27,8 @@ jobs: with: name: sizecurrent path: bazel-bin/test/performance/test_binary_size - sizemaster: - name: size_master + sizemain: + name: size_main runs-on: ubuntu-18.04 timeout-minutes: 60 steps: @@ -39,18 +39,18 @@ jobs: run: ./ci/linux_ci_setup.sh - name: 'Build test binary' run: | - git checkout master && git pull origin master && git submodule update + git checkout main && git pull origin main && git submodule update export PATH=/usr/lib/llvm-8/bin:$PATH export CC=clang export CXX=clang++ bazel build //test/performance:test_binary_size --config=sizeopt - uses: actions/upload-artifact@v1 with: - name: sizemaster + name: sizemain path: bazel-bin/test/performance/test_binary_size sizecompare: name: size_compare - needs: [sizecurrent, sizemaster] + needs: [sizecurrent, sizemain] runs-on: ubuntu-18.04 timeout-minutes: 30 steps: @@ -63,14 +63,14 @@ jobs: path: dist/sizecurrent - uses: actions/download-artifact@v1 with: - name: sizemaster - path: dist/sizemaster + name: sizemain + path: dist/sizemain - name: 'Strip and Zip binary' run: | ls -lh dist/ - strip -s -o dist/master.stripped dist/sizemaster/test_binary_size + strip -s -o dist/main.stripped dist/sizemain/test_binary_size strip -s -o dist/current.stripped dist/sizecurrent/test_binary_size - zip -9 dist/master.zip dist/master.stripped + zip -9 dist/main.zip dist/main.stripped zip -9 dist/current.zip dist/current.stripped - name: 'Test size regression' - run: ./ci/test_size_regression.sh dist/master.zip dist/current.zip + run: ./ci/test_size_regression.sh dist/main.zip dist/current.zip