summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/daily.yml21
-rw-r--r--.github/workflows/master.yml16
2 files changed, 24 insertions, 13 deletions
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 81d379264..59150b200 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -25,15 +25,17 @@ jobs:
hdri: no
steps:
- - uses: actions/checkout@master
- with:
- fetch-depth: 1
-
- name: Install dependencies
run: |
+ set -e
apt update
sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
apt-get install -y autoconf pkg-config gcc msttcorefonts libfontconfig1-dev libfreetype6-dev libltdl-dev
+
+ - uses: actions/checkout@v1
+ with:
+ fetch-depth: 1
+
- name: Configure ImageMagick
run: |
export CFLAGS="-Wno-deprecated-declarations"
@@ -42,6 +44,7 @@ jobs:
- name: Build ImageMagick
run: |
make
+
- name: Test ImageMagick
run: |
make check || exit_code=$?
@@ -69,18 +72,20 @@ jobs:
steps:
- name: Clone ImageMagick-Windows
- uses: actions/checkout@master
+ uses: actions/checkout@v1
with:
- fetch-depth: 1
repository: ImageMagick/ImageMagick-Windows
- ref: remotes/origin/master
+ ref: refs/heads/master
+ fetch-depth: 1
- name: Clone repositories
+ shell: cmd
run: |
cd %RUNNER_WORKSPACE%\ImageMagick-Windows
CloneRepositories.cmd https://github.com/ImageMagick shallow
- name: Build configure
+ shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
@@ -88,11 +93,13 @@ jobs:
msbuild configure.sln /m /t:Rebuild /p:Configuration=Release,Platform=Win32
- name: Configure ImageMagick
+ shell: cmd
run: |
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
configure.exe /noWizard /VS2019 /${{matrix.platform}} /${{matrix.buildType}}
- name: Build ImageMagick
+ shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c06f9f8c6..608bdee40 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -22,16 +22,16 @@ jobs:
compiler: [ gcc, clang ]
steps:
- - uses: actions/checkout@master
- with:
- fetch-depth: 1
-
- name: Install dependencies
run: |
set -e
apt-get update -y
apt-get install -y autoconf pkg-config ${{matrix.compiler}}
+ - uses: actions/checkout@v1
+ with:
+ fetch-depth: 1
+
- name: Configure ImageMagick
run: |
export CC=${{matrix.compiler}}
@@ -49,7 +49,7 @@ jobs:
runs-on: macos-latest
steps:
- - uses: actions/checkout@master
+ - uses: actions/checkout@v1
with:
fetch-depth: 1
@@ -75,18 +75,20 @@ jobs:
runs-on: windows-latest
steps:
- - uses: actions/checkout@master
+ - uses: actions/checkout@v1
with:
repository: ImageMagick/ImageMagick-Windows
ref: refs/heads/master
fetchDepth: 1
- name: Clone repositories
+ shell: cmd
run: |
cd %RUNNER_WORKSPACE%\ImageMagick-Windows
CloneRepositories.cmd https://github.com/ImageMagick shallow
- name: Build configure
+ shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
@@ -94,11 +96,13 @@ jobs:
msbuild configure.sln /m /t:Rebuild /p:Configuration=Release,Platform=Win32
- name: Configure ImageMagick
+ shell: cmd
run: |
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick\configure
configure.exe /noWizard /VS2019 /x64 /smtd
- name: Build ImageMagick
+ shell: cmd
run: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
cd %RUNNER_WORKSPACE%\ImageMagick-Windows\VisualMagick