Skip to content

Commit

Permalink
Bump from 0.9.2 to 0.9.3 (#38)
Browse files Browse the repository at this point in the history
* Fix summary (#34)

* Modify summary page

* Add measured and processed data for TOF
* Move report.cif from Analysis main view to sidebar text mode
* Show html-based analysis summary in the Analysis main view
* Allow saving analysis summary as html

* Update images for GUI tests

* Fix signing macos (#35)

* Temporarily remove the CI script for snapcraft

* Simplify build script to try code signing

* MACOS_CERTIFICATE_ENCODED (.p12 content base64 encoded) updated on github
* MACOS_CERTIFICATE_PASSWORD (.p12 password) updated on github

* Rename fpath to fname

* Migrate from altool to notarytool

* altool is depricated
* Migration instruction https://developer.apple.com/documentation/technotes/tn3147-migrating-to-the-latest-notarization-tool

* Fix spctl verbose output option

* Try using lando/code-sign-action instead of custom script

* Fix file path in the code signing script

* Update certificate identity

* Debug

* Fix identity

* more debug

* more debug

* more debug

* more debug

* debug: return after verify

* debug: return after sign

* debug: return before verify

* debug 2: return after sign

* more debug

* Another try with lando/code-sign-action

* More debug terminal

* more debug

* fix

* More fixes

* More fixes

* continue after signing

* Remove sleep before staple (moved to notarisation)

* clean up

* Rename variables and clean up

* More clean up

* Fix team-id

* Restore other steps in the build script

* Force to use numpy<2

* Use full os name in uploaded artifacts

* Windows signing (#33)

* initial test, mostly to get the filenames first

* attempt to locate the signed binary

* play with filename

* try again

* another attempt at properly delimit the string

* go back to the whole matrix before PR

* remove debug printouts

* Get path to setup_exe from Config.py

---------

Co-authored-by: Andrew Sazonov <andrew.sazonov@icloud.com>

* Prepare for releasing 0.9.2

* Fix release info [ci skip]

* Return snapcraft build script back (#37)

* Update release info

---------

Co-authored-by: Piotr Rozyczko <piotr.rozyczko@gmail.com>
  • Loading branch information
AndrewSazonov and rozyczko authored Jun 21, 2024
1 parent a244de8 commit 29f1775
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 9 deletions.
82 changes: 82 additions & 0 deletions .github/workflows/snapcraft.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Build Snap Image

on:
push:
branches:
- "**"
pull_request:
branches:
- "**"

jobs:
build_snap:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: snapcore/action-build@v1
id: snapcraft
- uses: actions/upload-artifact@v3
with:
name: snap
path: ${{ steps.snapcraft.outputs.snap }}

install_test:
runs-on: ubuntu-latest
needs: build_snap
steps:
- uses: actions/download-artifact@v3
with:
name: snap
path: .
- name: Install snap
run: |
sudo snap install --dangerous *.snap
- name: Set up screen dependencies (Linux)
run: |
sudo apt-get -o Acquire::Retries=3 update
sudo apt-get -o Acquire::Retries=3 install libxcb-xinerama0
sudo apt-get -o Acquire::Retries=3 install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0
sudo apt-get -o Acquire::Retries=3 install libpulse-mainloop-glib0
sudo apt-get -o Acquire::Retries=3 install libxkbcommon-x11-0
Xvfb :0 -screen 0 1920x1080x24 -ac &
echo "DISPLAY=:0" >> $GITHUB_ENV
- name: Run snap
run: |
snap run easydiffraction &
sleep 60
upload_snap:
runs-on: ubuntu-latest
needs: install_test
steps:
- uses: actions/download-artifact@v3
with:
name: snap
path: .

- name: Get branch names
id: branch-name
uses: tj-actions/branch-names@v6

- name: Get snap filename
run: |
echo "SNAP_FILENAME=$(ls *.snap)" >> $GITHUB_ENV
- name: Publish Develop Branch to snapcraft beta
# if: steps.branch-name.outputs.current_branch == 'develop'
if: steps.branch-name.outputs.current_branch == 'master' # temporarily master will produce beta
uses: snapcore/action-publish@v1
env:
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
with:
snap: ${{ env.SNAP_FILENAME }}
release: beta

#- name: Publish Master Branch to snapcraft stable
# if: steps.branch-name.outputs.current_branch == 'master'
# uses: snapcore/action-publish@v1
# env:
# SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
# with:
# snap: ${{ env.SNAP_FILENAME }}
# release: stable
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# Version 0.9.3 (21 Jun 2024)

This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.

### Bug Fixes

- The package for Snap Store (Linux) has been added back

# Version 0.9.2 (20 Jun 2024)

This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.
Expand Down
9 changes: 1 addition & 8 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
This is a test version of EasyDiffraction with improved GUI and overall performance. This version temporarily does not use the EasyScience framework, contains only CrysPy as calculation engine and uses only Lmfit for minimization.

### New Features

- The analysis page now has an _html_-based analysis summary
- The CIF-based report on the Summary page has now been moved from _Main View_ to _Sidebar_ (`Text mode` tab)
- User can now save the analysis summary in _html_ format
- Installers for macOS and Windows are now signed

### Bug Fixes

- Measured and processed TOF data are now correctly displayed on the Summary page
- The package for Snap Store (Linux) has been added back
2 changes: 1 addition & 1 deletion easyDiffractionApp/Gui/Globals/Configs.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ QtObject { // If "Unknown component. (M300) in QtCreator", try: "Tools > QML/JS
readonly property var projectConfig: QtObject {
readonly property var release: QtObject { // NEED FIX
readonly property string appName: 'EasyDiffraction'
readonly property string version: '0.9.2'
readonly property string version: '0.9.3'
readonly property string appIssuesUrl: 'https://github.com/easyscience/easydiffractionapp/issues'
readonly property string homePageUrl: 'https://easydiffraction.org'
readonly property string docsUrl: 'https://docs.easydiffraction.org/app/'
Expand Down

0 comments on commit 29f1775

Please sign in to comment.