From ea8abb7446f42f8f94350853b46b36a2d482819d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan-David=20Schr=C3=B6der?= Date: Fri, 13 Nov 2020 16:17:19 +0100 Subject: [PATCH] #5 #75 using gmic submodule (9) --- .github/workflows/build.yml | 6 +++--- .github/workflows/cpythonpythonpackage.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9df7a62b..66e55ea8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,9 +39,9 @@ jobs: shell: cmd run: | REM call scripts\build_win_x86.bat - cd gmic\src - git checkout 2.9.1 - cd ..\.. + cd gmic + git checkout v.2.9.1 + cd .. C:\msys64\usr\bin\wget.exe -P gmic\src https://gmic.eu/gmic_stdlib.h C:\msys64\usr\bin\wget.exe -P gmic\src https://github.com/dtschump/CImg/raw/master/CImg.h vcpkg install libpng:x64-windows libjpeg-turbo:x64-windows zlib:x64-windows curl:x64-windows tiff:x64-windows fftw3:x64-windows diff --git a/.github/workflows/cpythonpythonpackage.yml b/.github/workflows/cpythonpythonpackage.yml index fd2f27ac..ff891edb 100644 --- a/.github/workflows/cpythonpythonpackage.yml +++ b/.github/workflows/cpythonpythonpackage.yml @@ -39,9 +39,9 @@ jobs: PYTHON3: python3 PIP3: pip3 run: | - cd gmic/src - git checkout 2.9.1 - cd ../.. + cd gmic + git checkout v.2.9.1 + cd .. for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done sudo apt-get update; sudo apt-get install -y libfftw3-dev libcurl4-openssl-dev libpng-dev zlib1g-dev libomp5 libomp-dev sudo apt-get install clang-format