Skip to content

Commit

Permalink
Upgrade to Go 1.20
Browse files Browse the repository at this point in the history
With the release of Go 1.20, version 1.18 is not supported anymore. This
change upgrades the project to Go 1.20.
  • Loading branch information
adamantike committed Feb 20, 2023
1 parent e4bbe8c commit 007857a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
uses: actions/checkout@v2
- uses: actions/setup-go@v3
with:
go-version: '^1.18.3'
go-version: '^1.20.1'
- name: Build Binaries
run: |
make binary-clean binary-all
Expand All @@ -111,4 +111,4 @@ jobs:
name: binaries.zip
path: |
scrutiny-web-*
scrutiny-collector-metrics-*
scrutiny-collector-metrics-*
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
name: workspace
- uses: actions/setup-go@v3
with:
go-version: '1.18.3' # The Go version to download (if necessary) and use.
go-version: '1.20.1' # The Go version to download (if necessary) and use.
- name: Build Binaries
run: |
make binary-clean binary-all
Expand Down
20 changes: 10 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ The Scrutiny repository is a [monorepo](https://en.wikipedia.org/wiki/Monorepo)
- Scrutiny Frontend Angular SPA
- S.M.A.R.T Collector

Depending on the functionality you are adding, you may need to setup a development environment for 1 or more projects.
Depending on the functionality you are adding, you may need to setup a development environment for 1 or more projects.

# Modifying the Scrutiny Backend Server (API)

1. install the [Go runtime](https://go.dev/doc/install) (v1.18+)
1. install the [Go runtime](https://go.dev/doc/install) (v1.20+)
2. download the `scrutiny-web-frontend.tar.gz` for
the [latest release](https://github.com/AnalogJ/scrutiny/releases/latest). Extract to a folder named `dist`
3. create a `scrutiny.yaml` config file
```yaml
# config file for local development. store as scrutiny.yaml
version: 1

web:
listen:
port: 8080
Expand All @@ -29,13 +29,13 @@ Depending on the functionality you are adding, you may need to setup a developme
path: ./dist
influxdb:
retention_policy: false

log:
file: 'web.log' #absolute or relative paths allowed, eg. web.log
level: DEBUG

```
4. start a InfluxDB docker container.
4. start a InfluxDB docker container.
```bash
docker run -p 8086:8086 --rm influxdb:2.2
```
Expand All @@ -60,16 +60,16 @@ The frontend is written in Angular. If you're working on the frontend and can us
3. open your browser and visit [http://localhost:4200/web](http://localhost:4200/web)

# Modifying both Scrutiny Backend and Frontend Applications
If you're developing a feature that requires changes to the backend and the frontend, or a frontend feature that requires real data,
If you're developing a feature that requires changes to the backend and the frontend, or a frontend feature that requires real data,
you'll need to follow the steps below:

1. install the [Go runtime](https://go.dev/doc/install) (v1.18+)
1. install the [Go runtime](https://go.dev/doc/install) (v1.20+)
2. install [NodeJS](https://nodejs.org/en/download/)
3. create a `scrutiny.yaml` config file
```yaml
# config file for local development. store as scrutiny.yaml
version: 1
web:
listen:
port: 8080
Expand All @@ -82,7 +82,7 @@ you'll need to follow the steps below:
path: ./dist
influxdb:
retention_policy: false
log:
file: 'web.log' #absolute or relative paths allowed, eg. web.log
level: DEBUG
Expand Down Expand Up @@ -185,4 +185,4 @@ docker run -p 8086:8086 -d --rm \
influxdb:2.2
go test ./...
```
```
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


########
FROM golang:1.18-bullseye as backendbuild
FROM golang:1.20-bullseye as backendbuild

WORKDIR /go/src/github.com/analogj/scrutiny
COPY . /go/src/github.com/analogj/scrutiny
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.collector
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


########
FROM golang:1.18-bullseye as backendbuild
FROM golang:1.20-bullseye as backendbuild

WORKDIR /go/src/github.com/analogj/scrutiny

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.web
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


########
FROM golang:1.18-bullseye as backendbuild
FROM golang:1.20-bullseye as backendbuild

WORKDIR /go/src/github.com/analogj/scrutiny

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/analogj/scrutiny

go 1.18
go 1.20

require (
github.com/analogj/go-util v0.0.0-20190301173314-5295e364eb14
Expand Down

0 comments on commit 007857a

Please sign in to comment.