further cleanup

SasView · Jan 3, 2024 · 44ddfac · 44ddfac
1 parent d86ae90
commit 44ddfac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -226,12 +226,6 @@ jobs:
           iscc installers/installer.iss
           mv installers/Output/setupSasView.exe installers/dist
 
-      - name: Fix qt folders
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        run: |
-          cd installers/dist
-          python ../../build_tools/fix_qt_folder_names_for_codesign.py SasView5.app
-
       - name: Sign executable and create dmg (OSX)
         if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
         env:
@@ -246,17 +240,12 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k DloaAcYP build.keychain
 
           cd installers/dist
+          python ../../build_tools/fix_qt_folder_names_for_codesign.py SasView5.app
           python ../../build_tools/code_sign_osx.py
           codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView5.app
           hdiutil create SasView5.dmg -srcfolder SasView5.app -ov -format UDZO
           codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView5.dmg
 
-#      - name: Build sasview installer dmg file (OSX)
-#        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-#        run: |
-#          cd installers/dist
-#          hdiutil create SasView5.dmg -srcfolder SasView5.app -ov -format UDZO
-
       - name: Build sasview installer tarball (Linux)
         if: ${{ matrix.installer && startsWith(matrix.os, 'ubuntu') }}
         run: |

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -37,37 +37,6 @@ jobs:
         run: ls -R
         working-directory: installers/dist
 
-      - name: Set up Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install wheel setuptools
-          python -m pip install macholib 
-
-#      - name: Sign executable and create dmg (OSX)
-#        env:
-#          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-#          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-#        run: |
-#          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-#          security create-keychain -p DloaAcYP build.keychain
-#          security default-keychain -s build.keychain
-#          security unlock-keychain -p DloaAcYP build.keychain
-#          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
-#          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k DloaAcYP build.keychain
-#
-#          mv installers/dist/SasView-Installer-macos-*/SasView5.app installers/dist
-#
-#          cd installers/dist
-#          python ../../build_tools/code_sign_osx.py
-#          codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView5.app
-#          hdiutil create SasView5.dmg -srcfolder SasView-nightly-MacOSX.dmg -ov -format UDZO
-#          codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView-nightly-MacOSX.dmg
-
       - name: Rename remaining artifacts artifacts
         run: |
           mv installers/dist/SasView-Installer-windows-*/setupSasView.exe installers/dist/setupSasView-nightly-Win64.exe
@@ -78,7 +47,7 @@ jobs:
         uses: lando/notarize-action@v2
         with:
             product-path: "installers/dist/SasView-nightly-MacOSX.dmg"
-            primary-bundle-id: "org.sasview.SasView5"
+            primary-bundle-id: "org.sasview.SasView6"
             appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
             appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
             appstore-connect-team-id: W2AG9MPZ43