fix: update libjq-go: better compile performance

- fix build in actions and Dockefiles

Author: diafour

.github/workflows/build.yaml

@@ -63,7 +63,6 @@ jobs:
 
           git clone https://github.com/flant/libjq-go libjq-go
           cd libjq-go
-          git checkout fix_build_script
           git submodule update --init --recursive
           sudo ./scripts/install-libjq-dependencies-ubuntu.sh
 

.github/workflows/lint.yaml

@@ -47,8 +47,7 @@ jobs:
       # Restore libjq-go-build directory from cache or build it, upload it as artifact for other jobs.
       - name: Extract libjq-go.lock from go.mod
         run: |
-          grep 'flant/libjq-go' go.mod > libjq-go.lock
-          cat libjq-go.lock
+          go list -m github.com/flant/libjq-go | tee > libjq-go.lock
 
       - name: Cache libjq libraries
         id: libjq-cache
@@ -65,7 +64,7 @@ jobs:
 
           git clone https://github.com/flant/libjq-go libjq-go
           cd libjq-go
-          git submodule update --init
+          git submodule update --init --recursive
           sudo ./scripts/install-libjq-dependencies-ubuntu.sh
 
           ./scripts/build-libjq-static.sh ${GITHUB_WORKSPACE}/libjq-go ${GITHUB_WORKSPACE}/libjq
@@ -76,10 +75,10 @@ jobs:
         run: |
           echo ::set-env name=CGO_ENABLED::1
 
-          CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/build/jq/include"
+          CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/include"
           echo ::set-env name=CGO_CFLAGS::${CGO_CFLAGS}
 
-          CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/build/onig/lib -L$GITHUB_WORKSPACE/libjq/build/jq/lib"
+          CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/lib"
           echo ::set-env name=CGO_LDFLAGS::${CGO_LDFLAGS}
 
           echo ::set-env name=GOOS::linux

.github/workflows/tests.yaml

@@ -76,8 +76,7 @@ jobs:
       # Restore libjq-go-build directory from cache or build it, upload it as artifact for other jobs.
       - name: Extract libjq-go.lock from go.mod
         run: |
-          grep 'flant/libjq-go' go.mod > libjq-go.lock
-          cat libjq-go.lock
+          go list -m github.com/flant/libjq-go | tee > libjq-go.lock
 
       - name: Cache libjq libraries
         id: libjq-cache
@@ -94,7 +93,7 @@ jobs:
 
           git clone https://github.com/flant/libjq-go libjq-go
           cd libjq-go
-          git submodule update --init
+          git submodule update --init --recursive
           sudo ./scripts/install-libjq-dependencies-ubuntu.sh
 
           ./scripts/build-libjq-static.sh ${GITHUB_WORKSPACE}/libjq-go ${GITHUB_WORKSPACE}/libjq
@@ -105,10 +104,10 @@ jobs:
         run: |
           echo ::set-env name=CGO_ENABLED::1
 
-          CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/build/jq/include"
+          CGO_CFLAGS="-I$GITHUB_WORKSPACE/libjq/include"
           echo ::set-env name=CGO_CFLAGS::${CGO_CFLAGS}
 
-          CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/build/onig/lib -L$GITHUB_WORKSPACE/libjq/build/jq/lib"
+          CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/lib"
           echo ::set-env name=CGO_LDFLAGS::${CGO_LDFLAGS}
 
           echo ::set-env name=GOOS::linux
@@ -165,8 +164,7 @@ jobs:
       # Restore libjq-go-build directory from cache or build it, upload it as artifact for other jobs.
       - name: Extract libjq-go.lock from go.mod
         run: |
-          grep 'flant/libjq-go' go.mod > libjq-go.lock
-          cat libjq-go.lock
+          go list -m github.com/flant/libjq-go | tee > libjq-go.lock
 
       - name: Cache libjq libraries
         id: libjq-cache
@@ -183,13 +181,12 @@ jobs:
 
           git clone https://github.com/flant/libjq-go libjq-go
           cd libjq-go
-          git submodule update --init
+          git submodule update --init --recursive
           sudo ./scripts/install-libjq-dependencies-ubuntu.sh
 
           ./scripts/build-libjq-static.sh ${GITHUB_WORKSPACE}/libjq-go ${GITHUB_WORKSPACE}/libjq
 
           tree  ${GITHUB_WORKSPACE}/libjq
-        shell: bash
 
       - name: Upload libjq libraries
         uses: actions/upload-artifact@master

Dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update && \
     cd /libjq-go && \
     git submodule update --init && \
     /libjq-go/scripts/install-libjq-dependencies-ubuntu.sh && \
-    /libjq-go/scripts/build-libjq-static.sh /libjq-go /out
+    /libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
 
 
 # build shell-operator binary
@@ -23,12 +23,12 @@ ADD go.mod go.sum /src/shell-operator/
 WORKDIR /src/shell-operator
 RUN go mod download
 
-COPY --from=libjq /out/build /build
+COPY --from=libjq /libjq /libjq
 ADD . /src/shell-operator
 
 RUN CGO_ENABLED=1 \
-    CGO_CFLAGS="-I/build/jq/include" \
-    CGO_LDFLAGS="-L/build/onig/lib -L/build/jq/lib" \
+    CGO_CFLAGS="-I/libjq/include" \
+    CGO_LDFLAGS="-L/libjq/lib" \
     GOOS=linux \
     go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" \
              -o shell-operator \

Dockerfile-alpine3.10

@@ -5,7 +5,7 @@ RUN apk --no-cache add git ca-certificates && \
     cd /libjq-go && \
     git submodule update --init && \
     /libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
-    /libjq-go/scripts/build-libjq-static.sh /libjq-go /out
+    /libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
 
 
 # build shell-operator binary
@@ -18,12 +18,12 @@ ADD go.mod go.sum /src/shell-operator/
 WORKDIR /src/shell-operator
 RUN go mod download
 
-COPY --from=libjq /out/build /build
+COPY --from=libjq /libjq /libjq
 ADD . /src/shell-operator
 
 RUN CGO_ENABLED=1 \
-    CGO_CFLAGS="-I/build/jq/include" \
-    CGO_LDFLAGS="-L/build/onig/lib -L/build/jq/lib" \
+    CGO_CFLAGS="-I/libjq/include" \
+    CGO_LDFLAGS="-L/libjq/lib" \
     GOOS=linux \
     go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" \
              -o shell-operator \

Dockerfile-alpine3.11

@@ -5,7 +5,7 @@ RUN apk --no-cache add git ca-certificates && \
     cd /libjq-go && \
     git submodule update --init && \
     /libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
-    /libjq-go/scripts/build-libjq-static.sh /libjq-go /out
+    /libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
 
 
 # build shell-operator binary
@@ -18,12 +18,12 @@ ADD go.mod go.sum /src/shell-operator/
 WORKDIR /src/shell-operator
 RUN go mod download
 
-COPY --from=libjq /out/build /build
+COPY --from=libjq /libjq /libjq
 ADD . /src/shell-operator
 
 RUN CGO_ENABLED=1 \
-    CGO_CFLAGS="-I/build/jq/include" \
-    CGO_LDFLAGS="-L/build/onig/lib -L/build/jq/lib" \
+    CGO_CFLAGS="-I/libjq/include" \
+    CGO_LDFLAGS="-L/libjq/lib" \
     GOOS=linux \
     go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" \
              -o shell-operator \

Dockerfile-alpine3.9

@@ -5,7 +5,7 @@ RUN apk --no-cache add git ca-certificates && \
     cd /libjq-go && \
     git submodule update --init && \
     /libjq-go/scripts/install-libjq-dependencies-alpine.sh && \
-    /libjq-go/scripts/build-libjq-static.sh /libjq-go /out
+    /libjq-go/scripts/build-libjq-static.sh /libjq-go /libjq
 
 
 # build shell-operator binary
@@ -18,12 +18,12 @@ ADD go.mod go.sum /src/shell-operator/
 WORKDIR /src/shell-operator
 RUN go mod download
 
-COPY --from=libjq /out/build /build
+COPY --from=libjq /libjq /libjq
 ADD . /src/shell-operator
 
 RUN CGO_ENABLED=1 \
-    CGO_CFLAGS="-I/build/jq/include" \
-    CGO_LDFLAGS="-L/build/onig/lib -L/build/jq/lib" \
+    CGO_CFLAGS="-I/libjq/include" \
+    CGO_LDFLAGS="-L/libjq/lib" \
     GOOS=linux \
     go build -ldflags="-s -w -X 'github.com/flant/shell-operator/pkg/app.Version=$appVersion'" \
              -o shell-operator \