Skip to content

Commit 304e43d

Browse files
authored
Merge pull request #235 from DLR-SC/joergbrech-patch-1
CI: Fix conan install
2 parents fddfd0c + 3563f0e commit 304e43d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
run: |
2424
sudo apt-get update -qq
2525
sudo apt-get install -y cmake cmake-data gfortran libcurl4-openssl-dev libxslt1-dev python3-setuptools
26-
sudo python3 -m pip install conan
26+
pip3 install --user conan
27+
source ~/.profile
2728
- name: Build TiXI
2829
run: |
2930
mkdir build
@@ -68,13 +69,13 @@ jobs:
6869
md c:\tixi-3rdparty -Force | Out-Null
6970
If (!(Test-Path -Path "c:\tixi-3rdparty\tixi-3rdparty-vc2015-win64")) {
7071
Write-Output "Downloading tixi 3rdparty libraries"
71-
(new-object System.Net.WebClient).Downloadfile("https://sourceforge.net/projects/tixi/files/dev-tools/tixi-3rdparty-vc2015-win64.zip", "c:\tixi-3rdparty-vc2015-win64.zip")
72+
Invoke-WebRequest -UserAgent "Wget" -Uri "https://sourceforge.net/projects/tixi/files/dev-tools/tixi-3rdparty-vc2015-win64.zip" -OutFile "c:\tixi-3rdparty-vc2015-win64.zip"
7273
Write-Output "Extract tixi 3rdparty libraries"
7374
& 7z x -y "c:\tixi-3rdparty-vc2015-win64.zip" -oC:\tixi-3rdparty\ > null
7475
}
7576
If (!(Test-Path -Path "c:\tixi-3rdparty\matlab-libs-win")) {
7677
Write-Output "Downloading matlab libraries"
77-
(new-object System.Net.WebClient).Downloadfile("https://sourceforge.net/projects/tixi/files/dev-tools/matlab-libs-win.zip", "c:\matlab-libs-win.zip")
78+
Invoke-WebRequest -UserAgent "Wget" -Uri "https://sourceforge.net/projects/tixi/files/dev-tools/matlab-libs-win.zip" -OutFile "c:\matlab-libs-win.zip"
7879
Write-Output "Extract matlab libraries"
7980
& 7z x -y "c:\matlab-libs-win.zip" -oC:\tixi-3rdparty\ > null
8081
}

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def generate(self):
5858

5959
def requirements(self):
6060
self.requires("libxml2/[>=2.12.5 <3]")
61-
self.requires("libxslt/1.1.39")
61+
self.requires("libxslt/1.1.42")
6262
self.requires("libcurl/[>=7.78.0 <9]")
6363

6464
def layout(self):

0 commit comments

Comments
 (0)