Skip to content

Commit bd3bb79

Browse files
authored
Merge branch 'main' into dependabot/github_actions/actions/setup-python-6
2 parents 71c7c11 + 64700ba commit bd3bb79

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.github/workflows/CI.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ jobs:
5858

5959
steps:
6060
- name: Checkout code
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v5
6262

6363
- name: Setup Fortran compiler
6464
uses: fortran-lang/[email protected]
65-
id: setup-fortran
65+
id: setup-fortran
6666
with:
6767
compiler: ${{ matrix.toolchain.compiler }}
6868
version: ${{ matrix.toolchain.version }}
@@ -207,7 +207,7 @@ jobs:
207207
gcc_v: [11,12,13]
208208

209209
steps:
210-
- uses: actions/checkout@v4
210+
- uses: actions/checkout@v5
211211

212212
- name: Download Artifacts
213213
uses: actions/download-artifact@v4
@@ -264,6 +264,20 @@ jobs:
264264
env:
265265
envar_download: "https://github.com/GsNSIS/EnVar/releases/download/v0.3.1/EnVar-Plugin.zip"
266266

267+
- name: Install NSIS
268+
run: choco install nsis -y
269+
shell: pwsh
270+
271+
- name: Add NSIS to PATH
272+
shell: pwsh
273+
run: |
274+
$dirs = @(
275+
"${env:ProgramFiles(x86)}\NSIS",
276+
"${env:ProgramFiles}\NSIS"
277+
) | Where-Object { $_ -and (Test-Path $_) }
278+
if (-not $dirs) { throw "NSIS not found under Program Files." }
279+
$dirs | ForEach-Object { $_ | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append }
280+
267281
- name: Generate installer
268282
run: |
269283
cd ./ci
@@ -291,7 +305,7 @@ jobs:
291305
env:
292306
DEPLOY_BRANCH: ${{ secrets.DEPLOY_BRANCH && contains(github.ref, secrets.DEPLOY_BRANCH) && 1 || 0 }}
293307

294-
- uses: actions/checkout@v4
308+
- uses: actions/checkout@v5
295309
if: ${{ github.event_name == 'push' }}
296310

297311
- name: Download Artifacts

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build-and-deploy:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010
- uses: actions/setup-python@v6
1111
with:
1212
python-version: '3.x'

.github/workflows/meta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
steps:
5858
- name: Checkout code
59-
uses: actions/checkout@v4
59+
uses: actions/checkout@v5
6060

6161
- name: (Ubuntu) setup gcc version
6262
if: contains(matrix.os,'ubuntu')

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
FORMAT: ${{ matrix.format }}
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121
with:
2222
fetch-depth: 0
2323

@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v5
4848
with:
4949
fetch-depth: 0
5050

@@ -124,7 +124,7 @@ jobs:
124124
env:
125125
DEPLOY_BRANCH: ${{ secrets.DEPLOY_BRANCH && contains(github.ref, secrets.DEPLOY_BRANCH) && 1 || 0 }}
126126

127-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v5
128128
if: ${{ github.event_name == 'push' }}
129129

130130
- name: Download Artifacts

0 commit comments

Comments
 (0)