Merge branch 'master' into patch-1

abatilo · Jan 9, 2024 · 1f314e8 · 1f314e8
2 parents 25e5565 + c31426b
commit 1f314e8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,13 +10,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-        poetry-version: ["latest", "1.0", "1.1.15", "1.2.2", "1.3.1"]
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        poetry-version: ["latest", "1.2.2", "1.3.2", "1.4.2", "1.5.1", "1.6.1"]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run image
@@ -25,9 +25,15 @@ jobs:
           poetry-version: ${{ matrix.poetry-version }}
       - name: View poetry --help
         run: poetry --help
+  ci-all:
+    runs-on: ubuntu-latest
+    needs: [ci]
+    steps:
+      - run: |
+          echo "All matrix jobs have completed successfully!"
   release:
     if: github.event_name == 'push'
-    needs: ci
+    needs: ci-all
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master

diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
@@ -10,6 +10,6 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v3.4.0
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
@@ -29,12 +29,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
-        poetry-version: ["1.0", "1.1.15"]
-        os: [ubuntu-18.04, macos-latest, windows-latest]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        poetry-version: ["1.2.2", "1.7.1"]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
@@ -80,7 +80,7 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Python
         uses: actions/setup-python@v4
         # see details (matrix, python-version, python-version-file, etc.)

diff --git a/action.yml b/action.yml
@@ -9,6 +9,10 @@ inputs:
     description: "The version of poetry to install"
     required: false
     default: "latest"
+  poetry-plugins:
+    description: "The whitespace/newline-separated list of poetry plugins to install."
+    required: false
+    default: ""
 runs:
   using: "composite"
   steps:
@@ -24,4 +28,10 @@ runs:
       run: |
         pipx install poetry==${{ inputs.poetry-version }}
       shell: bash
-
+    - if: ${{ inputs.poetry-plugins != '' }}
+      run: |
+        ALL_PLUGINS=$(echo "${{ inputs.poetry-plugins }}")
+        for PLUGIN in $ALL_PLUGINS; do
+          poetry self add $PLUGIN
+        done
+      shell: bash