Skip to content

Commit

Permalink
Update go toolstack
Browse files Browse the repository at this point in the history
  • Loading branch information
diericd committed Oct 23, 2024
1 parent c340d61 commit 9a4718b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 71 deletions.
14 changes: 7 additions & 7 deletions .config/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG grafana_image=grafana-oss
FROM --platform=$BUILDPLATFORM grafana/${grafana_image}:${grafana_version}

ARG development=true
ARG GO_VERSION=1.22.1
ARG GO_VERSION=1.23.2

RUN

Expand All @@ -29,14 +29,14 @@ USER root
# Installing supervisor and inotify-tools
RUN if [ "${development}" = "true" ]; then \
if grep -i -q alpine /etc/issue; then \
apk add supervisor inotify-tools git; \
apk add supervisor inotify-tools git; \
elif grep -i -q ubuntu /etc/issue; then \
DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y supervisor inotify-tools git && \
rm -rf /var/lib/apt/lists/*; \
DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y supervisor inotify-tools git && \
rm -rf /var/lib/apt/lists/*; \
else \
echo 'ERROR: Unsupported base image' && /bin/false; \
echo 'ERROR: Unsupported base image' && /bin/false; \
fi \
fi

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ jobs:
if: steps.check-for-backend.outputs.has-backend == 'true'
uses: actions/setup-go@v5
with:
go-version: '1.22.1'
go-version: '1.23.1'

- name: golangci-lint
if: steps.check-for-backend.outputs.has-backend == 'true'
uses: golangci/golangci-lint-action@v6
with:
version: v1.59
version: v1.60
only-new-issues: true

- name: gosec
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A data source backend plugin consists of both frontend and backend components, f

### Prerequisites

- [Go 1.22.1 or later](https://golang.org/dl/)
- [Go 1.23.2 or later](https://golang.org/dl/)
- [Mage](https://magefile.org/)
- [Node.js 20 LTS](https://nodejs.org/en/download/) with [pnpm 8](https://pnpm.io/installation)
- [Docker](https://docs.docker.com/get-docker/)
Expand Down
Loading

0 comments on commit 9a4718b

Please sign in to comment.