Merge stuff

Author: rocky

.github/workflows/macos.yml

@@ -7,27 +7,27 @@ on:
     branches: [ master, python-3.7-to-3.10 ]
 
 jobs:
-  build-master:
-    if: github.ref == 'refs/heads/master'
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: master
-    - name: Set up Python 3.13
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.13
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test decompyle3
-      run: |
-        make check
+  # build-master:
+  #   if: github.ref == 'refs/heads/master'
+  #   runs-on: macos-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       ref: master
+  #   - name: Set up Python 3.13
+  #     uses: actions/setup-python@v5
+  #     with:
+  #       python-version: 3.13
+  #   - name: Install dependencies
+  #     run: |
+  #       python -m pip install --upgrade pip
+  #       # Until the next xdis release
+  #       pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
+  #       pip install -e .
+  #       pip install -r requirements-dev.txt
+  #   - name: Test decompyle3
+  #     run: |
+  #       make check
 
   build-37-to-310:
     if: github.ref == 'refs/heads/python-3.7-to-3.10'
@@ -43,6 +43,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test decompyle3

.github/workflows/ubuntu.yml

@@ -7,27 +7,27 @@ on:
     branches: [ master, python-3.7-to-3.10 ]
 
 jobs:
-  build-master:
-    if: github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: master
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.10
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test decompyle3
-      run: |
-        make check
+  # build-master:
+  #   if: github.ref == 'refs/heads/master'
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       ref: master
+  #   - name: Set up Python 3.10
+  #     uses: actions/setup-python@v5
+  #     with:
+  #       python-version: 3.10
+  #   - name: Install dependencies
+  #     run: |
+  #       python -m pip install --upgrade pip
+  #       # Until the next xdis release
+  #       pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
+  #       pip install -e .
+  #       pip install -r requirements-dev.txt
+  #   - name: Test decompyle3
+  #     run: |
+  #       make check
 
   build-37-to-310:
     if: github.ref == 'refs/heads/python-3.7-to-3.10'
@@ -43,6 +43,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test decompyle3

.github/workflows/windows.yml

@@ -7,42 +7,22 @@ on:
     branches: [ master, python-3.7-to-3.10 ]
 
 jobs:
-  build-master:
-    if: github.ref == 'refs/heads/master'
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: master
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.10
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        # Until the next xdis release
-        pip install git+https://github.com/rocky/[email protected]#egg=xdis
-        pip install -e .
-        pip install -r requirements-dev.txt
-    - name: Test decompyle3
-      run: |
-        make check
-
   build-37-to-310:
     if: github.ref == 'refs/heads/python-3.7-to-3.10'
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
       with:
         ref: python-3.7-to-3.10
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        # Until the next xdis release
+        pip install --local -e git+https://github.com/rocky/[email protected]#egg=xdis
         pip install -e .
         pip install -r requirements-dev.txt
     - name: Test decompyle3