testing new environment file

CorwinAnsley · Sep 12, 2024 · 20a6885 · 20a6885
1 parent ac783fd
commit 20a6885
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 33 deletions.
diff --git a/.github/workflows/build_deb_pkg.yml b/.github/workflows/build_deb_pkg.yml
@@ -99,6 +99,24 @@ jobs:
       run: |
         git push origin HEAD:main
 
+    - name: pull piranha docker image
+      run: |
+        docker pull polionanopore/piranha:latest
+        
+    - name: save piranha docker image to file
+      working-directory: ./artifice/
+      run: |
+        mkdir piranha_image_file
+        docker save --output piranha_image_file/piranha.tar polionanopore/piranha:latest
+        
+    - name: Temporarily save piranha docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: piranha.tar
+        path: artifice/piranha_image_file/piranha.tar
+        retention-days: 1
+
+
   build_deb_release:
     needs: [prepare_build]
     runs-on: ubuntu-latest
@@ -123,22 +141,16 @@ jobs:
         # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install -r artifice/requirements.txt
         
-    - name: pull piranha docker image
-      run: |
-        docker pull polionanopore/piranha:latest
-        
-    - name: save piranha docker image to file
-      working-directory: ./artifice/
-      run: |
-        mkdir piranha_image_file
-        docker save --output piranha_image_file/piranha.tar polionanopore/piranha:latest
-        
-    - name: Temporarily save piranha docker image
-      uses: actions/upload-artifact@v4
-      with:
-        name: piranha.tar
-        path: artifice/piranha_image_file/piranha.tar
-        retention-days: 1
+ #   - name: make dir for piranha image file
+ #     working-directory: ./artifice
+ #     run: |
+ #       mkdir piranha_image_file
+
+#    - name: Retrieve saved piranha docker image
+#      uses: actions/download-artifact@v4
+#      with:
+#        name: piranha.tar
+#        path: artifice/piranha_image_file/
 
     - name: build deb package
       working-directory: ./artifice/linux_build/
@@ -189,11 +201,11 @@ jobs:
           miniforge-version: latest
           auto-activate-base: false
 
-    - name: Retrieve saved piranha docker image
-      uses: actions/download-artifact@v4
-      with:
-        name: piranha.tar
-        path: artifice/resources/
+#    - name: Retrieve saved piranha docker image
+#      uses: actions/download-artifact@v4
+#      with:
+#        name: piranha.tar
+#        path: artifice/resources/
 
     - name: build package
       working-directory: ./artifice/mac_build/pyinstaller_build/
@@ -237,16 +249,16 @@ jobs:
           miniforge-version: latest
           auto-activate-base: false
 
-    - name: make dir for piranha image file
-      working-directory: ./artifice
-      run: |
-        mkdir piranha_image_file
+#    - name: make dir for piranha image file
+#      working-directory: ./artifice
+#      run: |
+#        mkdir piranha_image_file
 
-    - name: Retrieve saved piranha docker image
-      uses: actions/download-artifact@v4
-      with:
-        name: piranha.tar
-        path: artifice/piranha_image_file/
+#    - name: Retrieve saved piranha docker image
+#      uses: actions/download-artifact@v4
+#      with:
+#        name: piranha.tar
+#        path: artifice/piranha_image_file/
 
     - name: build package
       working-directory: ./artifice/windows_build/

diff --git a/artifice/linux_build/create_deb_package b/artifice/linux_build/create_deb_package
@@ -12,11 +12,11 @@ chmod +x launch_script.sh
 cp launch_script.sh ./dist
 
 cp -r ./dist/. $ART_PKG_NAME/usr/local/ARTIFICE
-cp -r ../piranha_image_file/. $ART_PKG_NAME/~/.local/share
+#cp -r ../piranha_image_file/. $ART_PKG_NAME/~/.local/share
 mkdir -p $ART_PKG_NAME/DEBIAN
 cp ./linux_dist_files/$APPLICATION_NAME/control $ART_PKG_NAME/DEBIAN/
 mv -t ./pkg_file/ $ART_PKG_NAME 
 cd pkg_file
-chmod -rw ./$ART_PKG_NAME/~/.local/share/piranha.tar
+#chmod -rw ./$ART_PKG_NAME/~/.local/share/piranha.tar
 chmod +x ./$ART_PKG_NAME/usr/local/ARTIFICE/launch_script.sh
 dpkg-deb --build --root-owner-group $ART_PKG_NAME
diff --git a/artifice/windows_build/dist/piranhaGUI_installer.iss b/artifice/windows_build/dist/piranhaGUI_installer.iss
@@ -21,7 +21,7 @@ Name: desktopicon; Description: "Create a &desktop icon";
 Source: "piranhaGUI.exe"; DestDir: "{app}"
 ;Source: "runs\archived_runs.json"; DestDir: "{app}\runs"
 Source: "resources\*"; DestDir: "{app}\resources"
-Source: "piranha_image_file\piranha.tar"; DestDir: "{localappdata}\piranhaGUI"
+;Source: "piranha_image_file\piranha.tar"; DestDir: "{localappdata}\piranhaGUI"
 Source: "builtin_protocols\*"; DestDir: "{app}\builtin_protocols"; Flags: ignoreversion recursesubdirs
 Source: "config.yml"; DestDir: "{app}"