py3.8 for build/test - forgot to remove from wheels

Chia-Network · Jan 6, 2021 · 6f51ed9 · 6f51ed9
1 parent b19e9fe
commit 6f51ed9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 66 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/setup-python@v2
       name: Install Python
       with:
-        python-version: '3.7'
+        python-version: '3.8'
 
     - name: Build source distribution with Ubuntu-latest
       if: startsWith(matrix.os, 'ubuntu')
@@ -35,19 +35,6 @@ jobs:
         pip install build
         python -m build --sdist --outdir dist .
 
-    - name: Mac OS build C++ and test
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        ls -l
-        export MACOSX_DEPLOYMENT_TARGET=10.14
-        mkdir -p build
-        ls -l build
-        cd build
-        cmake ../
-        cmake --build . -- -j 6
-        echo "Running ./src/runtest"
-        ./src/runtest
-
     - name: Ubuntu build C++ and test with valgrind
       if: startsWith(matrix.os, 'ubuntu')
       run: |
@@ -77,6 +64,19 @@ jobs:
         ./src/runtest
         valgrind --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all  ./src/runtest
 
+    - name: Mac OS build C++ and test
+      if: startsWith(matrix.os, 'macos')
+      run: |
+        ls -l
+        export MACOSX_DEPLOYMENT_TARGET=10.14
+        mkdir -p build
+        ls -l build
+        cd build
+        cmake ../
+        cmake --build . -- -j 6
+        echo "Running ./src/runtest"
+        ./src/runtest
+
     - name: Test pure python implementation
       run: |
         python python-impl/impl-test.py
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -53,12 +53,6 @@ jobs:
         pip install mypy
         mypy --config-file mypi.ini python-bindings python-impl
 
-    - name: Build source distribution with MacOS
-      if: startsWith(matrix.os, 'mac')
-      run: |
-        pip install build
-        python -m build --sdist --outdir dist .
-
     - name: Build wheel and test
       run: |
         python -m cibuildwheel --output-dir dist
@@ -128,52 +122,6 @@ jobs:
         # pytest {project}/python-impl/tests.py
         CIBW_TEST_COMMAND: pytest -v {project}/python-bindings/test.py
 
-    - name: Mac OS build C++ and test
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        ls -l
-        export MACOSX_DEPLOYMENT_TARGET=10.14
-        mkdir -p build
-        ls -l build
-        cd build
-        cmake ../
-        cmake --build . -- -j 6
-        echo "Running ./src/runtest"
-        ./src/runtest
-
-    - name: Ubuntu build C++ and test with valgrind
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt-get update
-        sudo apt-get install valgrind -y
-        sudo apt-get install snap -y
-        sudo apt-get remove --purge cmake -y
-        sudo snap install cmake --classic
-        hash -r
-        cmake --version
-        echo "attempting to curl"
-        curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable.tar.gz | tar xz
-        echo "curl complete."
-        cd libsodium-stable
-        ls -l
-        ./configure --with-pic="yes"
-        make
-        sudo make install
-        cd ..
-        echo "Setting libsodium to static compile."
-        export CIBUILDWHEEL=1
-        mkdir -p build
-        cd build
-        cmake ../
-        cmake --build . -- -j 6
-        echo "Running ./src/runtest"
-        ./src/runtest
-        valgrind --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all  ./src/runtest
-
-    - name: Test pure python implementation
-      run: |
-        python python-impl/impl-test.py
-
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with: