From 2f905ba67f14f3af8ae3ca56ab60f3e9d8215520 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 30 Jul 2020 13:35:25 +0200
Subject: [PATCH] CI Win: merge two download sections
---
.github/workflows/ba-windows.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/.github/workflows/ba-windows.yml b/.github/workflows/ba-windows.yml
index e95359e35ac..840b1453ec2 100644
--- a/.github/workflows/ba-windows.yml
+++ b/.github/workflows/ba-windows.yml
@@ -112,7 +112,7 @@ jobs:
mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
cached: 'false'
- - name: Download ccache and Ninja
+ - name: Download ccache, Ninja, Nsis
id: ccache
shell: cmake -P {0}
run: |
@@ -124,10 +124,6 @@ jobs:
file(DOWNLOAD "${ninja_url}" ./ninja.zip SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./ninja.zip)
- - name: Download Nsis
- id: nsis
- shell: cmake -P {0}
- run: |
set(nsis_url "https://sourceforge.net/projects/nsis/files/NSIS%203/3.04/nsis-3.04.zip")
file(DOWNLOAD "${nsis_url}" ./nsis.zip SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ./nsis.zip)
--
GitLab