diff options
author | Paul Ganssle <git@m.ganssle.io> | 2022-12-03 12:55:49 -0500 |
---|---|---|
committer | Paul Ganssle <git@m.ganssle.io> | 2022-12-03 12:57:49 -0500 |
commit | 5d7d209b44adc7dd35adca354324d64a6eb320d6 (patch) | |
tree | bd95a12b41d0fa82f75c53a26cf759da3b83d8b1 | |
parent | e5ee2ae35118ee3f10b5984b54f5f8dd8ba57bde (diff) | |
download | dateutil-git-5d7d209b44adc7dd35adca354324d64a6eb320d6.tar.gz |
Combine "other" jobs into one matrix
This will be useful if/when we expand to include more linting
-rw-r--r-- | .github/workflows/validate.yml | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 66c98ad..296da5a 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -37,9 +37,7 @@ jobs: os: "ubuntu-20.04" - python-version: "3.5" os: "ubuntu-20.04" - - python-version: "3.6" - os: "ubuntu-20.04" - runs-on: ${{ matrix.os }} + - python-version: "3.6" os: "ubuntu-20.04" runs-on: ${{ matrix.os }} env: TOXENV: py steps: @@ -74,33 +72,33 @@ jobs: name: ${{ matrix.os }}:${{ matrix.python-version }} fail_ci_if_error: true - docs: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: "3.10" - - name: Install tox - run: python -m pip install -U tox - - name: Run tox - run: python -m tox -e docs + other: + runs-on: "ubuntu-latest" + strategy: + matrix: + toxenv: ["docs", "tz"] + env: + TOXENV: ${{ matrix.toxenv }} - latest-tz: - runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v3 + - name: ${{ matrix.toxenv }} + uses: actions/setup-python@v4 with: python-version: "3.10" - name: Install tox - run: python -m pip install -U "tox<3.8.0" + run: | + python -m pip install --upgrade pip + if [[ $TOXENV == "tz" ]]; then + python -m pip install -U "tox<3.8.0" + else + python -m pip install -U tox + fi - name: Run updatezinfo.py run: ./ci_tools/retry.sh python updatezinfo.py - - name: Run tox - run: python -m tox -e tz + if: matrix.toxenv == 'tox' + - name: Run action + run: tox build-dist: runs-on: ubuntu-latest |