diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a51ec96c..070bacb10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ # - Docker Hub # - Pypi -name: CI +name: build env: DEFAULT_DOCKER_IMAGE: nicolargo/glances diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..a055ed0ae --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,19 @@ +name: ci + +on: + pull_request: + branches: [ develop ] + push: + branches: [ master, develop ] + tags: + - v* + +jobs: + quality: + test: + needs: quality + webui: + if: ${{ always() }} + needs: [quality, test] + build: + needs: [quality, test, webui] diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/quality.yml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/quality.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7fa9c44b..234c84768 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test -on: [push] +# on: [push] jobs: test-linux: diff --git a/.github/workflows/node.js.yml b/.github/workflows/webui.yml similarity index 96% rename from .github/workflows/node.js.yml rename to .github/workflows/webui.yml index 147546df0..104660e6c 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/webui.yml @@ -1,7 +1,7 @@ # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Node.js CI +name: webui on: push: @@ -20,7 +20,7 @@ jobs: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Glances will be build with Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: