From 5054ececdd634b1c4c2f547d58f9e7b269d776ff Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Thu, 16 Apr 2026 17:02:28 +0200 Subject: [PATCH 1/6] Updated Project.toml and NEWS.md --- NEWS.md | 7 +++++++ Project.toml | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 46264b3..cb9be70 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,12 @@ # Release notes +## Version 0.7.0 (2026-04-16) + +### Breaking changes + +* Adjusted to [`EnergyModelsBase` v0.10.0](https://github.com/EnergyModelsX/EnergyModelsBase.jl/releases/tag/v0.10.0) and the corresponding dependency changes in the packages. +* The changes did not require any adjustments, but a breaking change is beneficial to be able to provide bugfixes for previous versions. + ## Version 0.6.3 (2026-01-13) ### Bugfix diff --git a/Project.toml b/Project.toml index fce1ed7..37f6483 100644 --- a/Project.toml +++ b/Project.toml @@ -41,9 +41,9 @@ Colors = "0.13" DataFrames = "1" Dates = "1" Downloads = "1" -EnergyModelsBase = "0.9" -EnergyModelsGeography = "0.11.3" -EnergyModelsInvestments = "0.8" +EnergyModelsBase = "0.10" +EnergyModelsGeography = "0.12" +EnergyModelsInvestments = "0.9" FileIO = "1" GLMakie = "0.13" GeoJSON = "0.8" From 521f941f5928fb33bb5ffba63fa58173b6ca4817 Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Thu, 16 Apr 2026 17:22:37 +0200 Subject: [PATCH 2/6] Updated CI versions --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/documentation.yml | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1094539..99fc810 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - # Since EnergyModelsGUI doesn't have binary dependencies, + # Since EnergyModelsGUI doesn't have binary dependencies, # only test on a subset of possible platforms. include: - version: '1' # The latest point-release (Linux) @@ -22,7 +22,7 @@ jobs: #- version: '1' # The latest point-release (Windows) # os: windows-latest # arch: x64 - - version: 'lts' # lts + - version: 'lts' # lts os: ubuntu-latest arch: x64 #- version: 'lts' # lts @@ -32,12 +32,12 @@ jobs: # os: ubuntu-latest # arch: x64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.version }} arch: ${{ matrix.arch }} - - uses: julia-actions/cache@v1 + - uses: julia-actions/cache@v3 - name: Install Dependencies (Linux) if: ${{ matrix.os == 'ubuntu-latest' }} run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev xsettingsd x11-xserver-utils diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 80be4f4..24fc6f3 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -5,15 +5,20 @@ on: tags: '*' pull_request: types: [opened, synchronize, reopened] + +# needed to allow julia-actions/cache to delete old caches that it has created +permissions: + actions: write + contents: read jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@latest with: version: '1' - - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev xsettingsd x11-xserver-utils + - uses: julia-actions/cache@v3 - name: Install dependencies shell: julia --color=yes --project=docs/ {0} run: | @@ -24,4 +29,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key - run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs/ docs/make.jl \ No newline at end of file + run: julia --color=yes --project=docs/ docs/make.jl \ No newline at end of file From a30d2404ea42f48ffbd6290164f3d8d459e71cd4 Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Thu, 16 Apr 2026 17:33:09 +0200 Subject: [PATCH 3/6] Minor update to NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index cb9be70..ab8e84e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # Release notes -## Version 0.7.0 (2026-04-16) +## Version 0.7.0 (2026-04-17) ### Breaking changes From 3270cf0971a3395e4269e55acc4e8c0ccb182228 Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Thu, 16 Apr 2026 17:37:13 +0200 Subject: [PATCH 4/6] Updated version number --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 37f6483..e547d66 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "EnergyModelsGUI" uuid = "737a7361-d3b7-40e9-b1ac-59bee4c5ea2d" -version = "0.6.3" +version = "0.7.0" authors = ["Jon Vegard Venås ", "Dimitri Pinel ", "Magnus Askeland ", "Shweta Tiwari "] [deps] From 3e7fc8c057368253f5e4f35e785d7e373a61ea26 Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Thu, 16 Apr 2026 17:40:11 +0200 Subject: [PATCH 5/6] Fix CI for docs --- .github/workflows/documentation.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 24fc6f3..e9fb52c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -19,6 +19,7 @@ jobs: with: version: '1' - uses: julia-actions/cache@v3 + - run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev xsettingsd x11-xserver-utils - name: Install dependencies shell: julia --color=yes --project=docs/ {0} run: | @@ -29,4 +30,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key - run: julia --color=yes --project=docs/ docs/make.jl \ No newline at end of file + run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes --project=docs/ docs/make.jl \ No newline at end of file From 5a596f153f42a269f5851c51ce4b05be68aec81c Mon Sep 17 00:00:00 2001 From: Julian Straus Date: Fri, 17 Apr 2026 07:24:50 +0200 Subject: [PATCH 6/6] Added permissions for caching --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99fc810..705bb4f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,11 @@ on: - release-* pull_request: types: [opened, synchronize, reopened] + +# needed to allow julia-actions/cache to delete old caches that it has created +permissions: + actions: write + contents: read jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}