diff options
| author | Dirk Lemstra <dirk@lemstra.org> | 2019-12-06 21:40:29 +0100 |
|---|---|---|
| committer | Dirk Lemstra <dirk@lemstra.org> | 2019-12-06 21:40:29 +0100 |
| commit | 9d13d33cb3913ba64ba5e03916c7bf77d8770e6a (patch) | |
| tree | 285d4f88710b0178734522c2a5844a7ef469d1db /.github | |
| parent | ecfee3c3d2a0b8bdacf67451294498a7be35e91d (diff) | |
| download | ImageMagick-9d13d33cb3913ba64ba5e03916c7bf77d8770e6a.tar.gz | |
Switch back to checkout/@master and install git in the container.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/daily.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/master.yml | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 2b04cd5ba..f2458897f 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -25,16 +25,17 @@ jobs: hdri: no steps: - - uses: actions/checkout@v1 - 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 + apt-get install -y autoconf pkg-config gcc git msttcorefonts libfontconfig1-dev libfreetype6-dev libltdl-dev + + - uses: actions/checkout@master + with: + fetch-depth: 1 - name: Configure ImageMagick run: | diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5d1e03222..50854064e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -21,16 +21,16 @@ jobs: matrix: compiler: [ gcc, clang ] - steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 1 - - name: Install dependencies run: | set -e apt-get update -y - apt-get install -y autoconf pkg-config ${{matrix.compiler}} + apt-get install -y autoconf pkg-config git ${{matrix.compiler}} + + steps: + - uses: actions/checkout@master + with: + fetch-depth: 1 - name: Configure ImageMagick run: | @@ -49,7 +49,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@master with: fetch-depth: 1 |