Skip to content

Commit

Permalink
#5 #75 using gmic submodule (4)
Browse files Browse the repository at this point in the history
  • Loading branch information
myselfhimself committed Nov 13, 2020
1 parent bbc85f4 commit 5d86295
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,14 @@ 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 @@ -40,8 +47,6 @@ jobs:
shell: cmd
run: |
REM call scripts\build_win_x86.bat
C:\msys64\usr\bin\wget.exe gmic_stdlib.h https://gmic.eu/gmic_stdlib.h
C:\msys64\usr\bin\wget.exe CImg.h 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
17 changes: 14 additions & 3 deletions .github/workflows/cpythonpythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
submodules: true


# Prevent running this job on tag-based releases
Expand All @@ -31,6 +28,20 @@ jobs:
with:
python-version: 3.7

- 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: ./
env:
Expand Down

0 comments on commit 5d86295

Please sign in to comment.