Skip to content

Commit

Permalink
Upgrading names to SasView6 for linux and Mac distributions
Browse files Browse the repository at this point in the history
  • Loading branch information
Wojciech Potrzebowski committed Jan 5, 2024
1 parent 44ddfac commit 1d4f58b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,17 @@ 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/fix_qt_folder_names_for_codesign.py SasView6.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
codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.app
hdiutil create SasView6.dmg -srcfolder SasView6.app -ov -format UDZO
codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg
- name: Build sasview installer tarball (Linux)
if: ${{ matrix.installer && startsWith(matrix.os, 'ubuntu') }}
run: |
cd installers/dist
tar zcf sasview5.tar.gz sasview
tar zcf sasview6.tar.gz sasview
- name: Collect a debug tarball of the installer package
if: ${{ matrix.installer }}
Expand All @@ -268,8 +268,8 @@ jobs:
name: SasView-Installer-${{ matrix.os }}-${{ matrix.python-version }}
path: |
installers/dist/setupSasView.exe
installers/dist/SasView5.dmg
installers/dist/sasview5.tar.gz
installers/dist/SasView6.dmg
installers/dist/sasview6.tar.gz
if-no-files-found: error


Expand Down Expand Up @@ -379,7 +379,7 @@ jobs:
if: ${{ startsWith(matrix.os, 'ubuntu') }}
run: |
# $INSTALL_PATH is already the base directory
tar xf "$DL_PATH/sasview5.tar.gz"
tar xf "$DL_PATH/sasview6.tar.gz"
- name: Check installation files
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Rename remaining artifacts artifacts
run: |
mv installers/dist/SasView-Installer-windows-*/setupSasView.exe installers/dist/setupSasView-nightly-Win64.exe
mv installers/dist/SasView-Installer-macos-*/SasView5.dmg installers/dist/SasView-nightly-MacOSX.dmg
mv installers/dist/SasView-Installer-macos-*/SasView6.dmg installers/dist/SasView-nightly-MacOSX.dmg
mv installers/dist/SasView-Installer-ubuntu-*/sasview5.tar.gz installers/dist/SasView-nightly-Linux.tar.gz
- name: Notarize Release Build (OSX)
Expand Down
4 changes: 2 additions & 2 deletions installers/sasview.spec
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ coll = COLLECT(

if platform.system() == 'Darwin':
app = BUNDLE(coll,
name='SasView5.app',
name='SasView6.app',
icon='../src/sas/qtgui/images/ball.icns',
bundle_identifier='org.sasview.SasView5',
bundle_identifier='org.sasview.SasView6',
info_plist={'NSHighResolutionCapable': 'True'})

0 comments on commit 1d4f58b

Please sign in to comment.