IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade golangci-lint (#27719)

Browse Source 
* Chore: Upgrade golangci-lint to latest
* ci-build: Upgrade Node/Yarn

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-09-23 10:55:25 +02:00
committed by GitHub
parent ed054c205d
commit f5c2b771ee
9 changed files with 61 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build/ci-build/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
MacOSX*.tar.xz

16
scripts/build/ci-build/Dockerfile
View File

@@ -1,7 +1,5 @@
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20200803-slim AS toolchain
ARG OSX_SDK_URL
FROM debian:stretch-20200908-slim AS toolchain
ENV OSX_MIN=10.10 \
CTNG=1.24.0 \
@@ -49,7 +47,7 @@ RUN apt-get update && \
lzma-dev
RUN git clone https://github.com/tpoechtrager/osxcross.git /tmp/osxcross && \
cd /tmp/osxcross && git reset --hard $OSX_CROSS_REV
RUN curl -fL "${OSX_SDK_URL}" -o /tmp/osxcross/tarballs/$(echo "${OSX_SDK_URL}" | grep -E 'MacOSX[^?]+' -o)
COPY MacOSX10.15.sdk.tar.xz /tmp/osxcross/tarballs/
RUN ln -s /usr/bin/llvm-dsymutil-6.0 /usr/bin/dsymutil
RUN UNATTENDED=1 OSX_VERSION_MIN=${OSX_MIN} /tmp/osxcross/build.sh
RUN rm -rf /tmp/osxcross/target/SDK/*/usr/share && \
@@ -75,8 +73,8 @@ RUN cd /tmp && \
rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
rm -rf /tmp/crosstool-ng-${CTNG}
ARG GOLANGCILINT_VERSION=1.30.0
ARG GOLANGCILINT_CHKSUM=c8e8fc5753e74d2eb489ad428dbce219eb9907799a57c02bcd8b80b4b98c60d4
ARG GOLANGCILINT_VERSION=1.31.0
ARG GOLANGCILINT_CHKSUM=9a5d47b51442d68b718af4c7350f4406cdc087e2236a5b9ae52f37aebede6cb3
RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz
RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
@@ -85,13 +83,13 @@ RUN mv golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64/golangci-lint /tmp/
# Base image to crossbuild grafana.
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20200803
FROM debian:stretch-20200908
ENV GOVERSION=1.15.1 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=12.18.3-1nodesource1 \
YARNVERSION=1.22.4-1 \
NODEVERSION=12.18.4-1nodesource1 \
YARNVERSION=1.22.5-1 \
GO111MODULE=on
# Use ARG so as not to persist environment variable in image

2
scripts/build/ci-build/README.md
View File

@@ -23,6 +23,6 @@ The image is based on Debian Stretch, since we want an older Linux distribution
In order to build and publish the Grafana build Docker image, execute the following:
```
export OSX_SDK_URL=<f.ex. signed GCS URL to download OSX SDK>
# Download MacOSX10.15.sdk.tar.xz from our private GCS bucket into this directory
./build-deploy.sh
```

9
scripts/build/ci-build/build-deploy.sh
View File

@@ -1,16 +1,11 @@
#!/bin/bash
set -eo pipefail
_version="1.2.26"
_version="1.2.27"
_tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}")
cd "$_dpath"
if [[ -z "${OSX_SDK_URL}" ]]; then
echo You must set OSX_SDK_URL
exit 1
fi
docker build --build-arg OSX_SDK_URL="${OSX_SDK_URL}" -t $_tag .
docker build -t $_tag .
docker push $_tag