From 74a95e4845c4a3cc5931d5db3b677c27dbc40bfe Mon Sep 17 00:00:00 2001 From: Dmitrii Ustiugov Date: Thu, 15 Apr 2021 15:14:45 +0200 Subject: [PATCH] rename master to main in our CI Signed-off-by: Dmitrii Ustiugov --- .github/workflows/build.yml | 4 ++-- .github/workflows/build_docker_images.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/cri_minio_test.yml | 6 +++--- .github/workflows/cri_stock_containerd_test.yml | 4 ++-- .github/workflows/cri_test.yml | 4 ++-- .github/workflows/integration_tests.yml | 4 ++-- .github/workflows/linters.yml | 4 ++-- .github/workflows/unit_tests.yml | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29eafaf21..4c9a893ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,12 @@ name: vHive build tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml index c6d409dfa..bad732db8 100644 --- a/.github/workflows/build_docker_images.yml +++ b/.github/workflows/build_docker_images.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: master + ref: main - name: docker build images # Consecutive COPY commands in Dockerfile fail on github runners # Added "DOCKER_BUILDKIT=1" as a temporary fix @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: master + ref: main - name: pull binaries run: | git lfs pull diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 629546028..cb92599e2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main ] workflow_dispatch: schedule: - cron: '40 13 * * 2' diff --git a/.github/workflows/cri_minio_test.yml b/.github/workflows/cri_minio_test.yml index f70306ec1..e5fd1787e 100644 --- a/.github/workflows/cri_minio_test.yml +++ b/.github/workflows/cri_minio_test.yml @@ -2,12 +2,12 @@ name: MinIO tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' @@ -91,4 +91,4 @@ jobs: if: ${{ always() }} run: | make -C ./function-images/tests/save_load_minio clean - ./scripts/github_runner/clean_cri_runner.sh \ No newline at end of file + ./scripts/github_runner/clean_cri_runner.sh diff --git a/.github/workflows/cri_stock_containerd_test.yml b/.github/workflows/cri_stock_containerd_test.yml index d729b5452..103e45f8f 100644 --- a/.github/workflows/cri_stock_containerd_test.yml +++ b/.github/workflows/cri_stock_containerd_test.yml @@ -2,12 +2,12 @@ name: stock Containerd CRI tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' diff --git a/.github/workflows/cri_test.yml b/.github/workflows/cri_test.yml index 163d97efd..077e3ed69 100644 --- a/.github/workflows/cri_test.yml +++ b/.github/workflows/cri_test.yml @@ -2,12 +2,12 @@ name: vHive CRI tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 049380e08..4a35f84d9 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -2,12 +2,12 @@ name: vHive integration tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index dbd166d43..398676570 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -1,9 +1,9 @@ name: Linters on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index fcae9ab4f..7a2ec2b88 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -2,12 +2,12 @@ name: vHive unit tests on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' pull_request: - branches: [ master ] + branches: [ main ] paths-ignore: - 'docs/**' - '**.md' @@ -89,4 +89,4 @@ jobs: - name: Cleaning if: ${{ always() }} run: ./scripts/clean_fcctr.sh - \ No newline at end of file +