Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,26 @@ jobs:
- {
name: "Linux",
os: ubuntu-latest,
package: 'tar.gz'
arch: 'x86_64',
package: 'tar.gz',
}
- {
name: "MacOSX-intel",
os: macos-15-intel,
arch: 'x86_64',
package: 'dmg',
}
- {
name: "MacOSX",
os: macos-13,
package: 'dmg'
os: macos-15,
arch: 'arm64',
package: 'dmg',
}
- {
name: "Windows",
os: windows-latest,
package: 'msi'
arch: 'amd64',
package: 'msi',
}
defaults:
run:
Expand Down Expand Up @@ -110,7 +119,7 @@ jobs:
- name: Upload installer package
uses: actions/upload-artifact@v4
with:
name: HEXRDGUI-v${{env.VERSION}}.${{ matrix.config.package }}
name: HEXRDGUI-v${{ env.VERSION }}-${{ matrix.config.arch }}.${{ matrix.config.package }}
path: ${{ github.workspace }}/hexrdgui/packaging/HEXRDGUI-${{env.VERSION}}.${{ matrix.config.package }}

- name: Upload installer package Zip ( Windows only )
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
}
- {
name: "MacOSX",
os: macos-13
os: macos-15
}
- {
name: "Windows",
Expand Down
7 changes: 6 additions & 1 deletion conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ requirements:
- pyhdf
# This next one is needed to fix the app name on Mac
- pyobjc-framework-cocoa # [osx]
- pyside6
# Lock the PySide6 version to be less than 6.8 for Mac.
# This is because Qt 6.8 has some crashing issue we need
# to resolve. This issue is tracked in:
# https://github.com/HEXRD/hexrdgui/issues/1931
- pyside6<6.8 # [osx]
- pyside6 # [not osx]
- pyyaml
- silx-base

Expand Down
Loading