From 836858c3f437f58dbd1bf7f02bbb8a5212f04cb6 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Tue, 10 Mar 2026 13:19:45 +0100 Subject: [PATCH 1/2] v1.2.0 develop -> master (#10) * changes for the new release * ubuntu 20 -> ubuntu 24 * attempt 22.04 build * try soft linking directories --- .github/workflows/build.yml | 6 +++++- content/footer.yaml | 2 +- content/home.yaml | 7 +------ content/release.yaml | 8 ++++---- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b34c0d5..5b26128 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: build: if: "!contains(github.event.head_commit.message, '[ci skip]')" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Cancel previous workflow runs @@ -29,6 +29,10 @@ jobs: working-directory: .. run: git clone ${GITHUB_SERVER_URL}/EasyScience/EasySite + - name: Create project symlink for content + working-directory: .. + run: ln -s ${PROJECT_NAME}Www ${PROJECT_NAME} + - name: Add assets working-directory: .. run: cp -R ${PROJECT_NAME}Www/assets EasySite/src/copy diff --git a/content/footer.yaml b/content/footer.yaml index de622d4..2a33821 100644 --- a/content/footer.yaml +++ b/content/footer.yaml @@ -2,7 +2,7 @@ project: title: EasyReflectometry icon: icon-easyreflectometry url: https://easyreflectometry.org - year: 2024 + year: 2026 links: - url: https://github.com/easyscience/easyreflectometryapp/releases text: Release Notes diff --git a/content/home.yaml b/content/home.yaml index 75d2e98..9670943 100644 --- a/content/home.yaml +++ b/content/home.yaml @@ -53,12 +53,7 @@ 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.exe - - icon: fab fa-apple - top: Download for - bottom: macOS - details: macOS 13, Intel - url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_macos-13-Intel.zip + url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_windows-2022.zip - icon: fab fa-apple top: Download for bottom: macOS diff --git a/content/release.yaml b/content/release.yaml index cb135ad..97d81f2 100644 --- a/content/release.yaml +++ b/content/release.yaml @@ -1,7 +1,7 @@ release: app: - version: 1.0.0 - date: 2024-11-27 + version: 1.2.0 + date: 2026-03-10 lib: - version: 1.3.0 - date: 2024-11-27 \ No newline at end of file + version: 1.5.0 + date: 2026-03-09 From ac737b8af4ce0d54b9dedb7ce649aaf230dc618d Mon Sep 17 00:00:00 2001 From: rozyczko Date: Tue, 10 Mar 2026 13:32:43 +0100 Subject: [PATCH 2/2] typos fixed --- content/home.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/home.yaml b/content/home.yaml index f60e85e..89239a1 100644 --- a/content/home.yaml +++ b/content/home.yaml @@ -68,12 +68,12 @@ download: 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 + url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-22.04.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 + url: https://github.com/EasyScience/EasyReflectometryApp/releases/download/v$RELEASE_VERSION/EasyReflectometryApp_v$RELEASE_VERSION_ubuntu-24.04.zip - icon: fab fa-github top: Run it from bottom: source