diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-06 09:22:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 09:22:58 +0000 |
| commit | 4937562f7ca354dc80369cc2e049c391838537f1 (patch) | |
| tree | a87ab6cd252aa23f29cc1babe1a431ac8d6eca5e | |
| parent | 2800f4499fa476e215844d3a2fa19a86548f5033 (diff) | |
| parent | 777ef8a74c67815461e2ad18639eeeaffbcf8ace (diff) | |
| download | gcc-4937562f7ca354dc80369cc2e049c391838537f1.zip gcc-4937562f7ca354dc80369cc2e049c391838537f1.tar.gz gcc-4937562f7ca354dc80369cc2e049c391838537f1.tar.bz2 | |
Merge #331
331: Initial bors-ng integration r=philberty a=dkm
Github Action only triggered on bors-ng controlled branches (trying/staging).
Fixes #324
Co-authored-by: Marc Poulhiès <dkm@kataplop.net>
| -rw-r--r-- | .github/bors.toml | 6 | ||||
| -rw-r--r-- | .github/workflows/ccpp.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/clang-format.yml | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/.github/bors.toml b/.github/bors.toml new file mode 100644 index 0000000..9e3e740 --- /dev/null +++ b/.github/bors.toml @@ -0,0 +1,6 @@ +status = [ + "build-and-check", "clang-format" +] +# Uncomment this to use a two hour timeout. +# The default is one hour. +#timeout_sec = 7200 diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index dd08940..46d32cc 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -2,12 +2,14 @@ name: C/C++ CI on: push: - branches: [ master ] + branches: + - trying + - staging pull_request: branches: [ master ] jobs: - build: + build-and-check: runs-on: ubuntu-latest diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index ce045ab..d37247c 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -2,12 +2,14 @@ name: Clang Format Lint on: push: - branches: [ master ] + branches: + - trying + - staging pull_request: branches: [ master ] jobs: - build: + clang-format: runs-on: ubuntu-latest steps: |