From a4b023963543ced61dbde13bc6da3a21f9158428 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 28 Jul 2020 15:31:22 +0200 Subject: Group tests with similar duration together Style and documentation tests take just a few minutes to run. Since in Github actions one can't restart a single job but needs to restart an entire workflow, here we group tests with similar duration together. --- .github/workflows/linux_unit_tests.yaml | 38 -------------- .github/workflows/macos_unit_tests.yaml | 10 +--- .github/workflows/minimum_python_versions.yaml | 30 ----------- .github/workflows/style_and_docs.yaml | 70 ++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 76 deletions(-) delete mode 100644 .github/workflows/minimum_python_versions.yaml create mode 100644 .github/workflows/style_and_docs.yaml diff --git a/.github/workflows/linux_unit_tests.yaml b/.github/workflows/linux_unit_tests.yaml index 78fd0e8ce0..2166871f24 100644 --- a/.github/workflows/linux_unit_tests.yaml +++ b/.github/workflows/linux_unit_tests.yaml @@ -60,26 +60,6 @@ jobs: uses: codecov/codecov-action@v1 with: flags: unittests,linux - flake8: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install Python packages - run: | - pip install --upgrade pip six setuptools flake8 - - name: Setup git configuration - run: | - # Need this for the git tests to succeed. - git --version - git config --global user.email "spack@example.com" - git config --global user.name "Test User" - git fetch -u origin develop:develop - - name: Run flake8 tests - run: | - share/spack/qa/run-flake8-tests shell: runs-on: ubuntu-latest steps: @@ -122,21 +102,3 @@ jobs: uses: codecov/codecov-action@v1 with: flags: shelltests,linux - documentation: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install System packages - run: | - sudo apt-get -y update - sudo apt-get install -y coreutils ninja-build graphviz - - name: Install Python packages - run: | - pip install --upgrade pip six setuptools - pip install --upgrade -r lib/spack/docs/requirements.txt - - name: Build documentation - run: | - share/spack/qa/run-doc-tests diff --git a/.github/workflows/macos_unit_tests.yaml b/.github/workflows/macos_unit_tests.yaml index f1e856070c..ba275b711d 100644 --- a/.github/workflows/macos_unit_tests.yaml +++ b/.github/workflows/macos_unit_tests.yaml @@ -11,18 +11,12 @@ on: - releases/** jobs: build: - runs-on: macos-latest - strategy: - matrix: - python-version: [3.7] - steps: - uses: actions/checkout@v2 - - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: 3.7 - name: Install Python packages run: | pip install --upgrade pip six setuptools diff --git a/.github/workflows/minimum_python_versions.yaml b/.github/workflows/minimum_python_versions.yaml deleted file mode 100644 index a6ab5dfa40..0000000000 --- a/.github/workflows/minimum_python_versions.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: python version check - -on: - push: - branches: - - develop - - releases/** - pull_request: - branches: - - develop - - releases/** -jobs: - validate: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - name: Install Python Packages - run: | - pip install --upgrade pip - pip install --upgrade vermin - - name: Minimum Version (Spack's Core) - run: vermin --backport argparse -t=2.6- -t=3.5- -v lib/spack/spack/ lib/spack/llnl/ bin/ - - name: Minimum Version (Repositories) - run: vermin --backport argparse -t=2.6- -t=3.5- -v var/spack/repos diff --git a/.github/workflows/style_and_docs.yaml b/.github/workflows/style_and_docs.yaml new file mode 100644 index 0000000000..8bb6d2162a --- /dev/null +++ b/.github/workflows/style_and_docs.yaml @@ -0,0 +1,70 @@ +name: style and docs + +on: + push: + branches: + - develop + - releases/** + pull_request: + branches: + - develop + - releases/** +jobs: + validate: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: 3.7 + - name: Install Python Packages + run: | + pip install --upgrade pip + pip install --upgrade vermin + - name: Minimum Version (Spack's Core) + run: vermin --backport argparse -t=2.6- -t=3.5- -v lib/spack/spack/ lib/spack/llnl/ bin/ + - name: Minimum Version (Repositories) + run: vermin --backport argparse -t=2.6- -t=3.5- -v var/spack/repos + flake8: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install Python packages + run: | + pip install --upgrade pip six setuptools flake8 + - name: Setup git configuration + run: | + # Need this for the git tests to succeed. + git --version + git config --global user.email "spack@example.com" + git config --global user.name "Test User" + git fetch -u origin develop:develop + - name: Run flake8 tests + run: | + share/spack/qa/run-flake8-tests + documentation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install System packages + run: | + sudo apt-get -y update + sudo apt-get install -y coreutils ninja-build graphviz + - name: Install Python packages + run: | + pip install --upgrade pip six setuptools + pip install --upgrade -r lib/spack/docs/requirements.txt + - name: Build documentation + run: | + share/spack/qa/run-doc-tests -- cgit v1.2.3-60-g2f50