h3n3/h3n3-jmwright-CQ-Editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert to build Linux/MacOS in addition to Windows

Browse Source
This commit is contained in:
jdegenstein
2022-09-19 10:49:03 -05:00
committed by GitHub
parent c1441839f5
commit 6ef9017f85
1 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
.github/workflows/pyinstaller-builds-actions.yml vendored
View File

@@ -9,81 +9,81 @@ 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: conda-incubator/setup-miniconda@v2 - uses: conda-incubator/setup-miniconda@v2
# with: with:
# mamba-version: "*" mamba-version: "*"
# channels: conda-forge,defaults channels: conda-forge,defaults
# channel-priority: true channel-priority: true
# # auto-update-conda: true # auto-update-conda: true
# python-version: 3.9 python-version: 3.9
# activate-environment: test activate-environment: test
# - name: Install CadQuery, CQ-editor and pyinstaller - name: Install CadQuery, CQ-editor 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
# conda info conda info
# conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9 conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9
# conda install -c conda-forge pyinstaller=4.10 conda install -c conda-forge pyinstaller=4.10
# conda uninstall --force -y importlib_resources conda uninstall --force -y importlib_resources
# pip install path pip install path
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/gumyr/build123d.git#egg=build123d pip install git+https://github.com/gumyr/build123d.git#egg=build123d
# - name: Run build - name: Run build
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# conda info conda info
# pyinstaller pyinstaller.spec ${{ github.event.inputs.type }} pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
# cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/ cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
# rm /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor/libstdc++.so.6 rm /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor/libstdc++.so.6
# - uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
# with: with:
# name: CQ-editor-Linux-x86_64 name: CQ-editor-Linux-x86_64
# path: dist path: dist
# build-macos: build-macos:
# runs-on: macos-latest runs-on: macos-latest
# steps: steps:
# - uses: actions/checkout@v2 - uses: actions/checkout@v2
# - uses: conda-incubator/setup-miniconda@v2 - uses: conda-incubator/setup-miniconda@v2
# with: with:
# mamba-version: "*" mamba-version: "*"
# channels: conda-forge,defaults channels: conda-forge,defaults
# # auto-update-conda: true # auto-update-conda: true
# python-version: 3.9 python-version: 3.9
# activate-environment: test activate-environment: test
# - name: Install CadQuery, CQ-editor and pyinstaller=4.10 - name: Install CadQuery, CQ-editor and pyinstaller=4.10
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# conda info conda info
# conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9 conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9
# conda install -c conda-forge pyinstaller conda install -c conda-forge pyinstaller
# conda uninstall --force -y importlib_resources conda uninstall --force -y importlib_resources
# pip install path pip install path
# pip uninstall -y PyQt5 pip uninstall -y PyQt5
# pip install PyQt5==5.15.7 pip install PyQt5==5.15.7
# pip install PyQtWebEngine==5.15.6 pip install PyQtWebEngine==5.15.6
# pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
# pip install git+https://github.com/meadiode/cq_gears.git@main pip install git+https://github.com/meadiode/cq_gears.git@main
# pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache" pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
# pip install git+https://github.com/gumyr/build123d.git#egg=build123d pip install git+https://github.com/gumyr/build123d.git#egg=build123d
# - name: Run build - name: Run build
# shell: bash --login {0} shell: bash --login {0}
# run: | run: |
# conda info conda info
# pyinstaller pyinstaller.spec ${{ github.event.inputs.type }} pyinstaller pyinstaller.spec ${{ github.event.inputs.type }}
# cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/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: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
# with: with:
# name: CQ-editor-MacOS name: CQ-editor-MacOS
# path: dist path: dist
build-windows: build-windows:
runs-on: windows-latest runs-on: windows-latest
steps: steps: