Merge pull request #134 from netromdk/update-actions

[actions] Don't test using EOL Python 3.6
netromdk · Dec 20, 2022 · 16eebd0 · 16eebd0
2 parents cb06bbb + e7de7f7
commit 16eebd0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         # Start Linux jobs last since they are fastest to start and complete, and start 3.11 first,
         # since it pairs wiht macOS+Windows jobs.
-        python-version: ['3.11', '3.10', 3.6, 3.7, 3.8, 3.9, 2.7]
+        python-version: ['3.11', '3.10', 3.7, 3.8, 3.9, 2.7]
         os: [windows-latest, macos-latest, ubuntu-latest]
 
         # Choose test script depending on OS.
@@ -31,8 +31,6 @@ jobs:
         exclude:
           - os: macos-latest
             python-version: 2.7
-          - os: macos-latest
-            python-version: 3.6
           - os: macos-latest
             python-version: 3.7
           - os: macos-latest
@@ -43,8 +41,6 @@ jobs:
             python-version: '3.10'
           - os: windows-latest
             python-version: 2.7
-          - os: windows-latest
-            python-version: 3.6
           - os: windows-latest
             python-version: 3.7
           - os: windows-latest

diff --git a/misc/actions/test.ps1 b/misc/actions/test.ps1
@@ -1,6 +1,6 @@
 $PYTHON_VERSION = python -c "import sys;v=sys.version_info;print('{}.{}'.format(v[0],v[1]))"
 
-if ( $PYTHON_VERSION -eq "2.7" -or $PYTHON_VERSION -eq "3.4" -or $PYTHON_VERSION -eq "3.5" ) {
+if ( $PYTHON_VERSION -eq "2.7" -or $PYTHON_VERSION -eq "3.4" -or $PYTHON_VERSION -eq "3.5" -or $PYTHON_VERSION -eq "3.6") {
   make test
 }
 else {

diff --git a/misc/actions/test.sh b/misc/actions/test.sh
@@ -3,7 +3,11 @@ set -x
 
 PYTHON_VERSION=$(python -c "import sys;v=sys.version_info;print('{}.{}'.format(v[0],v[1]))")
 
-if [[ $PYTHON_VERSION = 2.7 || $PYTHON_VERSION = 3.4 || $PYTHON_VERSION = 3.5 ]]; then
+if [[ $PYTHON_VERSION = 2.7 ||
+      $PYTHON_VERSION = 3.4 ||
+      $PYTHON_VERSION = 3.5 ||
+      $PYTHON_VERSION = 3.6 ]];
+then
   make test
 else
   setup() {