From a274fbb79ce58685ba06c8149649afbf5ef1c71a Mon Sep 17 00:00:00 2001
From: Robin Fievet <robin.fievet@gatech.edu>
Date: Fri, 16 Aug 2024 21:32:44 -0400
Subject: [PATCH] try to reinstate LIReC_EXE

---
 .github/workflows/bundle_app.yml              | 9 +++++----
 .github/workflows/identify_target_version.yml | 2 +-
 boinc/version_template.xml                    | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/bundle_app.yml b/.github/workflows/bundle_app.yml
index 2d23c4e..7297f34 100644
--- a/.github/workflows/bundle_app.yml
+++ b/.github/workflows/bundle_app.yml
@@ -78,8 +78,8 @@ jobs:
         echo "$SIGNING_KEY" > key
         ls
         ./boinc/sign_executable app.$NEW_VERSION-$PLATFORM/$WRAPPER.exe key > app.$NEW_VERSION-$PLATFORM/$WRAPPER.exe.sig
-        ./boinc/sign_executable app.$NEW_VERSION-$PLATFORM/python311.dll key > app.$NEW_VERSION-$PLATFORM/python311.dll.sig
-        ./boinc/sign_executable app.$NEW_VERSION-$PLATFORM/python3.dll key > app.$NEW_VERSION-$PLATFORM/python3.dll.sig
+        # ./boinc/sign_executable app.$NEW_VERSION-$PLATFORM/python311.dll key > app.$NEW_VERSION-$PLATFORM/python311.dll.sig
+        # ./boinc/sign_executable app.$NEW_VERSION-$PLATFORM/python3.dll key > app.$NEW_VERSION-$PLATFORM/python3.dll.sig
         zip -r app.$NEW_VERSION-$PLATFORM.zip app.$NEW_VERSION-$PLATFORM
         ls
     - name: "Sign files"
@@ -106,7 +106,7 @@ jobs:
       run: |
         # Exclude the WRAPPER.exe and WRAPPER.exe.sig from this zip because they are included in app.$NEW_VERSION-$PLATFORM.zip
         # Including them again could cause issues with duplicate entries when updating versions on the BOINC server.
-        zip -r --junk-paths $BOINC_PLATFORM.zip . -i version.xml job.$NEW_VERSION-$PLATFORM.xml job.$NEW_VERSION-$PLATFORM.xml.sig app.$NEW_VERSION-$PLATFORM.zip app.$NEW_VERSION-$PLATFORM.zip.sig
+        zip -r --junk-paths $BOINC_PLATFORM.zip . -i version.xml WRAPPER.exe WRAPPER.exe.sig job.$NEW_VERSION-$PLATFORM.xml job.$NEW_VERSION-$PLATFORM.xml.sig app.$NEW_VERSION-$PLATFORM.zip app.$NEW_VERSION-$PLATFORM.zip.sig
     - name: "Create app bundle (non-Windows)"
       if: ${{ inputs.platform != 'win' }}
       run: |
@@ -152,7 +152,8 @@ jobs:
       if: ${{ ! vars.DO_NOT_DEPLOY }}
       run: |
         ssh boinc 'sudo su - boincadm -c "cd /home/boincadm/projects/boinc/apps/${{env.APP_DIR}}/${{env.NEW_VERSION}} && ls && unzip -o -q -d ${{env.BOINC_PLATFORM}} ${{env.BOINC_PLATFORM}}.zip && rm -f ${{env.BOINC_PLATFORM}}.zip && ls"'
-        ssh boinc 'sudo su - boincadm -c "cd /home/boincadm/projects/boinc/apps/${{env.APP_DIR}}/${{env.NEW_VERSION}}/${{env.BOINC_PLATFORM}} && ls && unzip -o -q app.${{env.NEW_VERSION}}-${{inputs.platform}}.zip && ls && mv app.${{env.NEW_VERSION}}-${{inputs.platform}}/* . && ls"'
+        ssh boinc 'sudo su - boincadm -c "cd /home/boincadm/projects/boinc/apps/${{env.APP_DIR}}/${{env.NEW_VERSION}}/${{env.BOINC_PLATFORM}} && ls && unzip -o -q app.${{env.NEW_VERSION}}-${{inputs.platform}}.zip && ls "'
+        #ssh boinc 'sudo su - boincadm -c "cd /home/boincadm/projects/boinc/apps/${{env.APP_DIR}}/${{env.NEW_VERSION}}/${{env.BOINC_PLATFORM}} && ls && unzip -o -q app.${{env.NEW_VERSION}}-${{inputs.platform}}.zip && ls && mv app.${{env.NEW_VERSION}}-${{inputs.platform}}/* . && ls"'
 
     - name: 'Run BOINC update versions'
       if: ${{ ! vars.DO_NOT_DEPLOY }}
diff --git a/.github/workflows/identify_target_version.yml b/.github/workflows/identify_target_version.yml
index 745042b..5bbb787 100644
--- a/.github/workflows/identify_target_version.yml
+++ b/.github/workflows/identify_target_version.yml
@@ -31,7 +31,7 @@ jobs:
         id: new_version_number
         env:
           BOINC_APP_DESCRIPTION: ${{ inputs.boinc_app_description }}
-          SPECIFIED_VERSION: '1.10'
+          SPECIFIED_VERSION: '1.12'
         run: |
           echo "BOINC_APP_DESCRIPTION: $BOINC_APP_DESCRIPTION"
           echo "SPECIFIED_VERSION: $SPECIFIED_VERSION"
diff --git a/boinc/version_template.xml b/boinc/version_template.xml
index f73e25e..4be7923 100644
--- a/boinc/version_template.xml
+++ b/boinc/version_template.xml
@@ -12,11 +12,5 @@
         <physical_name>app.{{VERSION}}-{{PLATFORM}}.zip</physical_name>
         <logical_name>app.zip</logical_name>
     </file>
-    <file>
-        <physical_name>python311.dll</physical_name>
-    </file>
-    <file>
-        <physical_name>python3.dll</physical_name>
-    </file>
     <is_wrapper/>
 </version>
\ No newline at end of file