Re-enable Linux/MacOS on -PIP-TAR.yaml

try and emulate Windows installation process, wherever possible
This commit is contained in:
jdegenstein
2022-10-28 11:52:16 -05:00
committed by GitHub
parent 26b64607a5
commit e436bd3d7e

View File

@@ -9,81 +9,85 @@ on:
required: true required: true
default: 'dir' default: 'dir'
jobs: jobs:
# build-linux: build-linux:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - uses: actions/checkout@v2 - uses: actions/checkout@v2
# - uses: mamba-org/provision-with-micromamba@main - uses: mamba-org/provision-with-micromamba@main
# with: with:
# #miniconda-version: "latest" #miniconda-version: "latest"
# #auto-update-conda: true #auto-update-conda: true
# environment-name: test environment-name: test
# environment-file: environment.yml environment-file: environment.yml
# extra-specs: extra-specs:
# python=3.9 python=3.9
# - name: Mamba install CadQuery and pyinstaller - name: Mamba install CadQuery and pyinstaller
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
# sudo apt install -y libxkbcommon0 sudo apt install -y libxkbcommon0
# sudo apt install -y libxkbcommon-x11-0 sudo apt install -y libxkbcommon-x11-0
# sudo apt install -y libxcb-xinerama0 sudo apt install -y libxcb-xinerama0
# micromamba info micromamba info
# micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9 pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
# micromamba install -c conda-forge pyinstaller=4.10 pip install --pre git+https://github.com/cadquery/cadquery casadi==3.5.5
# pip install path pip install pyinstaller==4.10
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install path
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install git+https://github.com/gumyr/build123d.git#egg=build123d pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/gumyr/build123d.git#egg=build123d
# - name: Run build pip install git+https://github.com/JustinSDK/cqMore
# shell: bash --login {0} pip list
# run: | - name: Run build
# micromamba info shell: bash --login {0}
# pyinstaller pyinstaller.spec ${{ github.event.inputs.type }} run: |
# cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/ micromamba info
# - uses: actions/upload-artifact@v2 pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
# with: cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
# name: CQ-editor-Linux-x86_64 - uses: alehechka/upload-tartifact@v1
# path: dist with:
# build-macos: name: CQ-editor-Linux-x86_64
# runs-on: macos-latest path: dist
# steps: build-macos:
# - uses: actions/checkout@v2 runs-on: macos-latest
# - uses: mamba-org/provision-with-micromamba@main steps:
# with: - uses: actions/checkout@v2
# #miniconda-version: "latest" - uses: mamba-org/provision-with-micromamba@main
# #auto-update-conda: true with:
# environment-name: test #miniconda-version: "latest"
# environment-file: environment.yml #auto-update-conda: true
# extra-specs: environment-name: test
# python=3.9 environment-file: environment.yml
# - name: Mamba install CadQuery and pyinstaller extra-specs:
# shell: bash --login {0} python=3.9
# run: | - name: Mamba install CadQuery and pyinstaller
# micromamba info shell: bash --login {0}
# micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9 run: |
# micromamba install -c conda-forge pyinstaller micromamba info
# pip install path pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
# pip uninstall -y PyQt5 pip install --pre git+https://github.com/cadquery/cadquery casadi==3.5.5
# pip install PyQt5==5.15.7 pip install pyinstaller==4.10
# pip install PyQtWebEngine==5.15.6 pip install path
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip uninstall -y PyQt5
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install PyQt5==5.15.7
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install PyQtWebEngine==5.15.6
# pip install git+https://github.com/gumyr/build123d.git#egg=build123d pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/meadiode/cq_gears.git@main
# - name: Run build pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# shell: bash --login {0} pip install git+https://github.com/gumyr/build123d.git#egg=build123d
# run: | pip install git+https://github.com/JustinSDK/cqMore
# micromamba info pip list
# pyinstaller pyinstaller.spec ${{ github.event.inputs.type }} - name: Run build
# cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/ shell: bash --login {0}
# - uses: actions/upload-artifact@v2 run: |
# with: micromamba info
# name: CQ-editor-MacOS pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
# path: dist cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
- uses: alehechka/upload-tartifact@v1
with:
name: CQ-editor-MacOS
path: dist
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps:
@@ -99,6 +103,7 @@ jobs:
- name: pip install cadquery CQ-editor ... etc - name: pip install cadquery CQ-editor ... etc
shell: powershell shell: powershell
run: | run: |
micromamba info
pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
pip install --pre git+https://github.com/cadquery/cadquery casadi==3.5.5 pip install --pre git+https://github.com/cadquery/cadquery casadi==3.5.5
pip install pyinstaller==4.10 pip install pyinstaller==4.10
@@ -109,7 +114,6 @@ jobs:
pip install git+https://github.com/gumyr/build123d.git#egg=build123d pip install git+https://github.com/gumyr/build123d.git#egg=build123d
pip install git+https://github.com/JustinSDK/cqMore pip install git+https://github.com/JustinSDK/cqMore
pip list pip list
tree $PWD /F
- name: Run build - name: Run build
shell: powershell shell: powershell
run: | run: |