Skip to content

Commit

Permalink
Bump go to 1.19.1 and alpine to 3.16 (grafana#2696)
Browse files Browse the repository at this point in the history
Co-authored-by: Ivan <[email protected]>
  • Loading branch information
agilob and codebien authored Sep 28, 2022
1 parent b5bbf7e commit 65fffda
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/arm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.18.x
go-version: 1.19.x
check-latest: true
- name: Run tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
LI_DOCKER_IMAGE_ID: "loadimpact/k6"
DOCKER_IMAGE_ID: "grafana/k6"
GHCR_IMAGE_ID: ${{ github.repository }}
DEFAULT_GO_VERSION: "1.18.x"
DEFAULT_GO_VERSION: "1.19.x"

jobs:
configure:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.18.x
go-version: 1.19.x
check-latest: true
- name: Check dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tc39.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.18.x
go-version: 1.19.x
check-latest: true
- name: Run tests
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.17.x]
go-version: [1.18.x]
platform: [ubuntu-latest, windows-2019]
runs-on: ${{ matrix.platform }}
steps:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.18.x]
go-version: [1.19.x]
platform: [ubuntu-latest, windows-2019]
runs-on: ${{ matrix.platform }}
steps:
Expand Down Expand Up @@ -126,4 +126,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: test-coverage-report-${{ matrix.platform }}
path: coverage.html
path: coverage.html
2 changes: 1 addition & 1 deletion .github/workflows/xk6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.18.x
go-version: 1.19.x
check-latest: true
- name: Install Go tip
if: matrix.go == 'tip'
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.18-alpine as builder
FROM golang:1.19-alpine as builder
WORKDIR $GOPATH/src/go.k6.io/k6
ADD . .
RUN apk --no-cache add git
RUN CGO_ENABLED=0 go install -a -trimpath -ldflags "-s -w -X go.k6.io/k6/lib/consts.VersionDetails=$(date -u +"%FT%T%z")/$(git describe --tags --always --long --dirty)"

FROM alpine:3.15
FROM alpine:3.16
RUN apk add --no-cache ca-certificates && \
adduser -D -u 12345 -g 12345 k6
COPY --from=builder /go/bin/k6 /usr/bin/k6
Expand Down

0 comments on commit 65fffda

Please sign in to comment.