Skip to content

Commit 94c7bd1

Browse files
committed
++
1 parent c485f2e commit 94c7bd1

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.github/workflows/tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@ jobs:
233233
234234
echo ::set-env name=CGO_ENABLED::1
235235
236-
CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/build/jq/include"
236+
CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/include"
237237
echo ::set-env name=CGO_CFLAGS::${CGO_CFLAGS}
238238
239-
CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/build/onig/lib -L$GITHUB_WORKSPACE/libjq/build/jq/lib"
239+
CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/lib"
240240
echo ::set-env name=CGO_LDFLAGS::${CGO_LDFLAGS}
241241
242242
echo ::set-env name=GOOS::linux
@@ -307,10 +307,10 @@ jobs:
307307
308308
echo ::set-env name=CGO_ENABLED::1
309309
310-
CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/build/jq/include"
310+
CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/include"
311311
echo ::set-env name=CGO_CFLAGS::${CGO_CFLAGS}
312312
313-
CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/build/onig/lib -L$GITHUB_WORKSPACE/libjq/build/jq/lib"
313+
CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/lib"
314314
echo ::set-env name=CGO_LDFLAGS::${CGO_LDFLAGS}
315315
316316
echo ::set-env name=GOOS::linux

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update && \
99
apt-get install -y git ca-certificates && \
1010
git clone https://github.com/flant/libjq-go /libjq-go && \
1111
cd /libjq-go && \
12-
git submodule update --init && \
12+
git submodule update --init --recursive && \
1313
/libjq-go/scripts/install-libjq-dependencies-ubuntu.sh && \
1414
/libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
1515

Dockerfile-alpine3.10

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM alpine:3.10 AS libjq
33
RUN apk --no-cache add git ca-certificates && \
44
git clone https://github.com/flant/libjq-go /libjq-go && \
55
cd /libjq-go && \
6-
git submodule update --init && \
6+
git submodule update --init --recursive && \
77
/libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
88
/libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
99

Dockerfile-alpine3.11

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM alpine:3.11 AS libjq
33
RUN apk --no-cache add git ca-certificates && \
44
git clone https://github.com/flant/libjq-go /libjq-go && \
55
cd /libjq-go && \
6-
git submodule update --init && \
6+
git submodule update --init --recursive && \
77
/libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
88
/libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
99

Dockerfile-alpine3.9

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM alpine:3.9 AS libjq
33
RUN apk --no-cache add git ca-certificates && \
44
git clone https://github.com/flant/libjq-go /libjq-go && \
55
cd /libjq-go && \
6-
git submodule update --init && \
6+
git submodule update --init --recursive && \
77
/libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
88
/libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
99

0 commit comments

Comments
 (0)