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

CI: Add GCC to Windows Docker image (#28562)

Browse Source 
* CI: Add GCC to Windows Docker image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CI: Upgrade golangci-lint in Windows Docker image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-10-28 11:00:33 +01:00 committed by GitHub
parent c4c5b2dc61
commit 0684d89c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/build/ci-build-windows/Dockerfile
View File

@ -7,8 +7,8 @@ RUN powershell Set-ExecutionPolicy RemoteSigned -Scope CurrentUser -Force
RUN powershell Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
# Scoop first of all needs git to update itself
# Run Scoop under PowerShell since it can otherwise fail
RUN powershell -Command scoop install git@2.28.0.windows.1
RUN powershell -Command scoop install go@1.15.2 unzip@6.00
RUN powershell -Command scoop install git@2.29.1.windows.1
RUN powershell -Command scoop install go@1.15.3 unzip@6.00 gcc@9.3.0-2
# Install diffutils, in case we need them
RUN powershell (New-Object Net.WebClient).DownloadFile(\
@ -21,12 +21,12 @@ RUN mkdir -p "C:\Program Files (x86)\GnuWin32"
RUN cd "C:\Program Files (x86)\GnuWin32" && unzip C:\App\diffutils-dep.zip && unzip C:\App\diffutils-bin.zip
RUN powershell (New-Object Net.WebClient).DownloadFile(\
\"https://github.com/golangci/golangci-lint/releases/download/v1.31.0/golangci-lint-1.31.0-windows-amd64.zip\", \
\"https://github.com/golangci/golangci-lint/releases/download/v1.32.0/golangci-lint-1.32.0-windows-amd64.zip\", \
\"golangci-lint.zip\")
RUN powershell (Get-FileHash golangci-lint.zip -Algorithm SHA256).Hash -eq \
\"6CE6B1D3207A63256D82FBBAC80BB9E85D7705EC1A408F005DFE324457C54966\"
\"97a69c2a153cd4285b7000b327aa6e77b694534e7463cbd1b77481c22b6113cf\"
RUN unzip golangci-lint.zip
RUN powershell -Command mv golangci-lint-1.31.0-windows-amd64\golangci-lint.exe .
RUN powershell -Command mv golangci-lint-1.32.0-windows-amd64\golangci-lint.exe .
RUN powershell -Command scoop cache rm '*'