From 89f0b14d8a6d06958f1e634dfa7fc2e89223015e Mon Sep 17 00:00:00 2001 From: rozyczko Date: Tue, 10 Mar 2026 12:03:34 +0100 Subject: [PATCH 1/4] changes for the new release --- content/footer.yaml | 2 +- content/home.yaml | 7 +------ content/release.yaml | 8 ++++---- 3 files changed, 6 insertions(+), 11 deletions(-) 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 87ec96edd76a1d7231dd25bd43f2b32af4e59348 Mon Sep 17 00:00:00 2001 From: rozyczko Date: Tue, 10 Mar 2026 12:46:32 +0100 Subject: [PATCH 2/4] ubuntu 20 -> ubuntu 24 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b34c0d5..ff7e879 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-24.04 steps: - name: Cancel previous workflow runs From 66359e978d472e428f8f36be593e8d777a49967a Mon Sep 17 00:00:00 2001 From: rozyczko Date: Tue, 10 Mar 2026 12:56:56 +0100 Subject: [PATCH 3/4] attempt 22.04 build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff7e879..ee7f454 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-24.04 + runs-on: ubuntu-22.04 steps: - name: Cancel previous workflow runs From 21c0f426fa0da4a376b3ccb5bbce04e53650fc30 Mon Sep 17 00:00:00 2001 From: rozyczko Date: Tue, 10 Mar 2026 12:59:44 +0100 Subject: [PATCH 4/4] try ln --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee7f454..5b26128 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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