Skip to content

Commit

Permalink
Merge pull request #56 from willfrey/patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
sondrelg committed Oct 1, 2021
2 parents fdde2e9 + c880a80 commit 620a491
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ on: pull_request

env:
# JSON variables (used in our strategy/matrix)
SUPPORTED_POETRY_VERSIONS: '\"poetry-version\":[\"1.1.0\", \"1.1.8\", \"1.2.0a2\"]'
SUPPORTED_PYTHON_VERSIONS: '\"python-version\":[\"3.7\", \"3.9\", \"3.10.0-beta.4\"]'
SUPPORTED_POETRY_VERSIONS: '\"poetry-version\":[\"1.1.0\", \"1.1.10\", \"1.2.0a2\"]'
SUPPORTED_PYTHON_VERSIONS: '\"python-version\":[\"3.7\", \"3.9\", \"3.10.0-rc.2\"]'
SUPPORTED_OPERATING_SYSTEMS: '\"os\":[\"ubuntu-latest\", \"macos-latest\", \"windows-latest\"]'

# Normal variables (used in steps/*)
LATEST_PYTHON: "3.9"
LATEST_POETRY: "1.1.8"
LATEST_POETRY: "1.1.10"

jobs:
# The set-env job translates our json variables to a format we
Expand Down Expand Up @@ -50,11 +50,11 @@ jobs:
# using the default settings, on all combinations of Python versions,
# Poetry versions, and operating systems that we want to test
test-install:
name: basic install - ${{ matrix.poetry-version }} - ${{ matrix.os }} - ${{ matrix.python-version }}-
name: basic install - ${{ matrix.poetry-version }} - ${{ matrix.os }} - ${{ matrix.python-version }}
needs: set-env
strategy:
fail-fast: true
matrix: ${{fromJson(needs.set-env.outputs.full-matrix)}}
matrix: ${{ fromJson(needs.set-env.outputs.full-matrix )}}
defaults:
run:
shell: bash
Expand All @@ -76,7 +76,7 @@ jobs:
needs: set-env
strategy:
fail-fast: true
matrix: ${{fromJson(needs.set-env.outputs.os-matrix)}}
matrix: ${{ fromJson(needs.set-env.outputs.os-matrix) }}
defaults:
run:
shell: bash
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
# feel free to update it
- run: |
source "./.github/scripts/assert.sh"
assert_in "1.1.8" "$(poetry --version)"
assert_in "1.1.10" "$(poetry --version)"
# Make sure scripts are not deleted.
# If we deleted the scripts folder (or subfolders) by accident,
Expand All @@ -160,13 +160,14 @@ jobs:
steps:
- uses: snok/install-poetry@v1
- uses: snok/install-poetry@v1.1
- uses: snok/install-poetry@v1.2

# Makes sure disabling parallel installs works
test-installer-parallel-false:
needs: set-env
strategy:
fail-fast: true
matrix: ${{fromJson(needs.set-env.outputs.os-matrix)}}
matrix: ${{ fromJson(needs.set-env.outputs.os-matrix) }}
defaults:
run:
shell: bash
Expand Down

0 comments on commit 620a491

Please sign in to comment.