Skip to content

Commit

Permalink
#5 #75 using gmic submodule (5)
Browse files Browse the repository at this point in the history
  • Loading branch information
myselfhimself committed Nov 13, 2020
1 parent 5d86295 commit 8bdb313
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- name: wget gmic_stdlib
uses: wei/wget@v1
with:
args: -P gmic/src https://gmic.eu/gmic_stdlib.h
- name: wget CImg
uses: wei/wget@v1
with:
args: -P gmic/src https://github.com/dtschump/CImg/raw/master/CImg.h
- uses: actions/setup-python@v2
name: Install Python
with:
Expand All @@ -47,6 +39,8 @@ jobs:
shell: cmd
run: |
REM call scripts\build_win_x86.bat
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
vcpkg list
python -m pip --disable-pip-version-check install cibuildwheel==1.6.1 wheel
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/cpythonpythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- name: wget gmic_stdlib
uses: wei/wget@v1
with:
args: -P gmic/src https://gmic.eu/gmic_stdlib.h
- name: wget CImg
uses: wei/wget@v1
with:
args: -P gmic/src https://github.com/dtschump/CImg/raw/master/CImg.h



- name: Compile and run tests on .so, .whl and source distribution of gmic-py ${{ env.GHA_GMIC_VERSION }}
working-directory: ./
Expand All @@ -54,6 +44,8 @@ jobs:
sudo apt-get install clang-format
bash build_tools.bash 21_check_c_style # should stop this script on style error
bash build_tools.bash 23_check_python_style # should stop this script on style error
wget -P gmic/src https://gmic.eu/gmic_stdlib.h
wget -P gmic/src https://github.com/dtschump/CImg/raw/master/CImg.h
bash build_tools.bash 2b_compile_debug
ldd build/lib.linux-x86_64-3.*/gmic.cpython-3*-x86_64-linux-gnu.so
Expand Down

0 comments on commit 8bdb313

Please sign in to comment.