From 20e8d623d03f70b62b54fc4aff3bcce168db875f Mon Sep 17 00:00:00 2001
From: jdegenstein <jdegenstein@users.noreply.github.com>
Date: Thu, 30 May 2024 13:13:05 -0500
Subject: [PATCH] pyinstaller-builds-actions-PIP-TAR.yml -> Updating actions
 and fixing MacOS/x86_64 builds

---
 .../pyinstaller-builds-actions-PIP-TAR.yml    | 34 ++++++++-----------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml b/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
index 8d72210..ee4fd58 100644
--- a/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
+++ b/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
@@ -15,14 +15,12 @@ jobs:
     - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
         create-args: >-
-            python=3.10
+            python=3.11
     - name: pip install cadquery CQ-editor ... etc
-      shell: bash --login {0}
+      shell: bash
       run: |
         sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
         sudo apt install -y libxkbcommon0
@@ -44,29 +42,27 @@ jobs:
         pip install git+https://github.com/JustinSDK/cqMore
         pip list
     - name: Run build
-      shell: bash --login {0}
+      shell: bash
       run: |
         micromamba info
         pyinstaller pyinstaller_pip.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/
-    - uses: alehechka/upload-tartifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: CQ-editor-Linux-x86_64
         path: dist
   build-macos:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
         create-args: >-
-            python=3.10
+            python=3.11
     - name: pip install cadquery CQ-editor ... etc
-      shell: bash --login {0}
+      shell: bash
       run: |
         micromamba info
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
@@ -84,12 +80,12 @@ jobs:
         pip install git+https://github.com/JustinSDK/cqMore
         pip list
     - name: Run build
-      shell: bash --login {0}
+      shell: bash
       run: |
         micromamba info
         pyinstaller pyinstaller_pip.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: alehechka/upload-tartifact@v1
+    - uses: actions/upload-artifact@v4
       with:
         name: CQ-editor-MacOS
         path: dist
@@ -99,16 +95,14 @@ jobs:
     - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
         init-shell: >-
             powershell
         create-args: >-
-            python=3.10
+            python=3.11
     - name: pip install cadquery CQ-editor ... etc
-      shell: powershell
+      shell: bash
       run: |
         micromamba info
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
@@ -123,12 +117,12 @@ jobs:
         pip install git+https://github.com/JustinSDK/cqMore
         pip list
     - name: Run build
-      shell: powershell
+      shell: bash
       run: |
         micromamba info
         pyinstaller pyinstaller_pip.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@v2
+        cp D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\
+    - uses: actions/upload-artifact@v4
       with:
         name: CQ-editor-Windows
         path: dist