2
0
Thomas Waldmann 4 жил өмнө
parent
commit
0950d23e4d
2 өөрчлөгдсөн 18 нэмэгдсэн , 6 устгасан
  1. 17 5
      .github/workflows/ci.yml
  2. 1 1
      tox.ini

+ 17 - 5
.github/workflows/ci.yml

@@ -49,17 +49,29 @@ jobs:
     needs: lint
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        python-version: [3.6, 3.7, 3.8, 3.9]
         include:
+            - os: ubuntu-20.04
+              python-version: 3.6
+              toxenv: py36-fuse2
+            - os: ubuntu-20.04
+              python-version: 3.7
+              toxenv: py37-fuse2
+            - os: ubuntu-20.04
+              python-version: 3.8
+              toxenv: py38-fuse3
+            - os: ubuntu-20.04
+              python-version: 3.9
+              toxenv: py39-fuse3
             - os: macos-latest
-              # note: it seems that 3.7 and 3.8 are currently broken,
+              # note: it seems that 3.8 and 3.9 are currently broken,
               # neverending RuntimeError crashes...
               python-version: 3.7
+              toxenv: py37-fuse2
 
     env:
       # Configure pkg-config to use OpenSSL from Homebrew
       PKG_CONFIG_PATH: /usr/local/opt/openssl@1.1/lib/pkgconfig
+      TOXENV: ${{ matrix.toxenv }}
 
     runs-on: ${{ matrix.os }}
 
@@ -98,7 +110,7 @@ jobs:
         brew install zstd || brew upgrade zstd
         brew install lz4 || brew upgrade lz4
         brew install openssl@1.1 || brew upgrade openssl@1.1
-        #brew install Caskroom/cask/osxfuse || brew upgrade Caskroom/cask/osxfuse  # Required for Python llfuse module
+        brew install Caskroom/cask/osxfuse || brew upgrade Caskroom/cask/osxfuse  # Required for Python llfuse module
 
     - name: Install Python requirements
       run: |
@@ -112,4 +124,4 @@ jobs:
       run: |
         # do not use fakeroot, but run as root. avoids the dreaded EISDIR sporadic failures. see #2482.
         #sudo -E bash -c "tox -e py"
-        tox -e py
+        tox --skip-missing-interpreters

+ 1 - 1
tox.ini

@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{36,37,38,39}-fuse{2,3}, flake8
+envlist = py{36,37,38,39}-fuse{2,3}
 
 [testenv]
 deps =