Skip to content

Develop -> master #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rozyczko merged 11 commits into from
Aug 11, 2026
Merged

Develop -> master #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89f0b14
changes for the new release
rozyczko Mar 10, 2026
d16db28
Merge pull request #9 from easyscience/v1.2.0
rozyczko Mar 10, 2026
87ec96e
ubuntu 20 -> ubuntu 24
rozyczko Mar 10, 2026
66359e9
attempt 22.04 build
rozyczko Mar 10, 2026
21c0f42
try ln
rozyczko Mar 10, 2026
77ccc52
Merge pull request #11 from easyscience/v1.2.0
rozyczko Mar 10, 2026
a76487b
V1.2.0 fix (#12)
rozyczko Mar 10, 2026
1ab5edc
v1.3.1 update (#14)
rozyczko May 1, 2026
c287fee
Merge branch 'master' into develop
rozyczko May 1, 2026
8ec1d06
new release 1.7.0 (#16)
rozyczko Aug 11, 2026
e30c01f
Merge branch 'master' into develop
rozyczko Aug 11, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Cancel previous workflow runs
uses: n1hility/cancel-previous-runs@v2
uses: n1hility/cancel-previous-runs@v3
with:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Check-out repository
uses: actions/checkout@v2
uses: actions/checkout@v7

- name: Declare env variables
if: github.event_name == 'push'
Expand Down
8 changes: 4 additions & 4 deletions content/home.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@ download:
top: Download for
details: Windows 10＋
bottom: Windows
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_windows-2022.zip
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_windows-2022_1.4.0.zip
- icon: fab fa-apple
top: Download for
bottom: macOS
details: macOS 14, Apple Silicon
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_macos-14-AppleSilicon.zip
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_macos-14-AppleSilicon_1.4.0.zip
- icon: icon-ubuntu
top: Download for
bottom: Ubuntu
details: Ubuntu 22.04
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-22.04.zip
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-22.04_1.4.0.zip
- icon: icon-ubuntu
top: Download for
bottom: Ubuntu
details: Ubuntu 24.04
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-24.04.zip
url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-24.04_1.4.0.zip
- icon: fab fa-github
top: Run it from
bottom: source
Expand Down
8 changes: 4 additions & 4 deletions content/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
release:
app:
version: 1.3.1
date: 2026-05-01
version: 1.4.0
date: 2026-08-03
lib:
version: 1.6.0
date: 2026-04-30
version: 1.7.0
date: 2026-07-31
Loading