From 6d0af77fba3d04862c21f1a5f68d7146a0a6b0df Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Aug 2021 15:53:21 +0800 Subject: [PATCH 1/3] Actions: Add github actions for CI --- .github/workflows/ci.yml | 19 ++++++++++++++++ .github/workflows/codeql-analysis.yml | 31 +-------------------------- README.md | 2 +- 3 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..cc93327af --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,19 @@ +name: "CI" + +on: + push: + branches: + - * + - feature/* + pull_request: + branches: + - * + - feature/* + +jobs: + actions-build-c7-baseline: + name: actions-build-c7-baseline + runs-on: ossrs/srs:dev + steps: + - uses: actions/checkout@v2 + - run: echo "Build SRS baseline" && cd trunk && ./configure && make \ No newline at end of file diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2ccac42d8..c5e8b83c2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,14 +1,3 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: @@ -23,16 +12,13 @@ on: jobs: analyze: - name: Analyze + name: codeql-analyze runs-on: ubuntu-latest strategy: fail-fast: false matrix: language: [ 'cpp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - name: Checkout repository @@ -43,22 +29,7 @@ jobs: uses: github/codeql-action/init@v1 with: languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - name: Build SRS run: | cd trunk && ./configure && make diff --git a/README.md b/README.md index 9434cfd60..38d9e2d81 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # SRS(Simple Realtime Server) ![](http://ossrs.net/gif/v1/sls.gif?site=github.com&path=/srs/4.0release) -[![](https://github.com/ossrs/srs/workflows/CodeQL/badge.svg)](https://github.com/ossrs/srs/actions?query=workflow%3ACodeQL) +[![](https://github.com/ossrs/srs/actions/workflows/codeql-analysis.yml/badge.svg?branch=4.0release)](https://github.com/ossrs/srs/actions?query=workflow%3ACodeQL+branch%3A4.0release) [![](https://circleci.com/gh/ossrs/srs/tree/4.0release.svg?style=svg&circle-token=1ef1d5b5b0cde6c8c282ed856a18199f9e8f85a9)](https://circleci.com/gh/ossrs/srs/tree/4.0release) [![](https://codecov.io/gh/ossrs/srs/branch/4.0release/graph/badge.svg)](https://codecov.io/gh/ossrs/srs/branch/4.0release) [![](https://gitee.com/winlinvip/srs-wiki/raw/master/images/wechat-badge.png)](../../wikis/Contact#wechat) From 26de8c65ad53c882ff7bb1c43e4c8a1acc25bc5c Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Aug 2021 15:57:46 +0800 Subject: [PATCH 2/3] Actions: Add github actions for CI --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc93327af..0c3163351 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,11 +3,13 @@ name: "CI" on: push: branches: - - * + - develop + - ?.0release - feature/* pull_request: branches: - - * + - develop + - ?.0release - feature/* jobs: From 94308253b7bd9b227f593e9dea7ed82d0dad63db Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 14 Aug 2021 16:16:56 +0800 Subject: [PATCH 3/3] Actions: Add github actions for CI --- .github/workflows/ci.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 0c3163351..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: "CI" - -on: - push: - branches: - - develop - - ?.0release - - feature/* - pull_request: - branches: - - develop - - ?.0release - - feature/* - -jobs: - actions-build-c7-baseline: - name: actions-build-c7-baseline - runs-on: ossrs/srs:dev - steps: - - uses: actions/checkout@v2 - - run: echo "Build SRS baseline" && cd trunk && ./configure && make \ No newline at end of file