From f66a6704f9d40764242a1e005ed7b6e147df7f55 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 7 Oct 2018 11:16:32 -0700 Subject: [PATCH] Makefile - make .msi download targets more robust. Now they should be insensitive to changes in the order of the builds on appveyor. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0dbc05a27..de57c449d 100644 --- a/Makefile +++ b/Makefile @@ -85,11 +85,11 @@ pandoc-$(version)-windows-%.msi: pandoc-windows-%.msi .INTERMEDIATE: pandoc-windows-i386.msi pandoc-windows-x86_64.msi pandoc-windows-i386.msi: - JOBID=$(shell curl 'https://ci.appveyor.com/api/projects/jgm/pandoc' | jq -r '.build.jobs[1].jobId') && \ + JOBID=$(shell curl https://ci.appveyor.com/api/projects/jgm/pandoc | jq '.build.jobs[]| select(.name|test("i386")) | .jobId') && \ wget "https://ci.appveyor.com/api/buildjobs/$$JOBID/artifacts/windows%2F$@" -O $@ pandoc-windows-x86_64.msi: - JOBID=$(shell curl 'https://ci.appveyor.com/api/projects/jgm/pandoc' | jq -r '.build.jobs[0].jobId') && \ + JOBID=$(shell curl https://ci.appveyor.com/api/projects/jgm/pandoc | jq '.build.jobs[]| select(.name|test("x86_64")) | .jobId') && \ wget "https://ci.appveyor.com/api/buildjobs/$$JOBID/artifacts/windows%2F$@" -O $@ man/pandoc.1: MANUAL.txt man/pandoc.1.template