From 3764233ed78cd6dbc6b88afe27b979e1a42991b5 Mon Sep 17 00:00:00 2001 From: jdegenstein Date: Tue, 25 Oct 2022 15:33:08 -0500 Subject: [PATCH] Update pyinstaller-builds-actions-mmamba-TAR.yml use windows only, disabled TAR --- .../pyinstaller-builds-actions-mmamba-TAR.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml b/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml index de1fbab..d3a58fd 100644 --- a/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml +++ b/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml @@ -1,4 +1,4 @@ -name: build-micromamba-TAR +name: build-micromamba on: schedule: - cron: '0 0 * * 1' @@ -31,20 +31,19 @@ jobs: # 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 # micromamba install -c conda-forge pyinstaller=4.10 - # micromamba uninstall --force -y importlib_resources # pip install path # 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 -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/JustinSDK/cqMore # - name: Run build # shell: bash --login {0} # run: | # micromamba info # 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/ - # rm /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor/libstdc++.so.6 - # - uses: actions/upload-tartifact@main + # - uses: actions/upload-artifact@v2 # with: # name: CQ-editor-Linux-x86_64 # path: dist @@ -66,7 +65,6 @@ jobs: # 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 # micromamba install -c conda-forge pyinstaller - # micromamba uninstall --force -y importlib_resources # pip install path # pip uninstall -y PyQt5 # pip install PyQt5==5.15.7 @@ -75,13 +73,14 @@ jobs: # 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 git+https://github.com/gumyr/build123d.git#egg=build123d + # pip install git+https://github.com/JustinSDK/cqMore # - name: Run build # shell: bash --login {0} # run: | # micromamba info # 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/ - # - uses: actions/upload-tartifact@main + # - uses: actions/upload-artifact@v2 # with: # name: CQ-editor-MacOS # path: dist @@ -109,17 +108,14 @@ jobs: 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 git+https://github.com/gumyr/build123d.git#egg=build123d + pip install git+https://github.com/JustinSDK/cqMore - name: Run build shell: powershell run: | micromamba info pyinstaller --debug all pyinstaller.spec ${{ github.event.inputs.type }} Copy-Item D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\ - - uses: alehechka/upload-tartifact@v1 + - uses: actions/upload-artifact@v2 with: name: CQ-editor-Windows path: dist - #- uses: alehechka/download-tartifact@v1 - # with: - # name: CQ-editor-Windows - # path: dist