Skip to content

Commit

Permalink
Merge pull request #10 from PelionIoT/update-depds
Browse files Browse the repository at this point in the history
Go1.20, update dependencies & update actions
  • Loading branch information
JanneKiiskila authored Jul 6, 2024
2 parents 653d97e + eac77d9 commit 6ed14e3
Show file tree
Hide file tree
Showing 93 changed files with 2,098 additions and 2,262 deletions.
24 changes: 11 additions & 13 deletions .github/workflows/PR-checker.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Build
name: PR-checker
on:
push:
# Don't run if only the .md -file is changed
paths-ignore:
- '**/*.md'
workflow_dispatch:

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
Expand All @@ -15,8 +16,9 @@ jobs:
strategy:
matrix:
# Can't use 1.15 because io.Discard is not defined
golang-ver: ["1.16", "1.17", "1.18", "1.19", "1.20"]
runs-on: ubuntu-latest
# Can't use 1.18 vendor/go.uber.org/multierr/error.go:224:20: undefined: atomic.Bool
golang-ver: ["1.19", "1.20", "1.21", "1.22"]
runs-on: ["self-hosted", "client"]
steps:
- name: Check out code
uses: actions/checkout@v4
Expand All @@ -26,19 +28,15 @@ jobs:
go-version: ${{ matrix.golang-ver }}
- name: Golang version
run: go version
- name: Set access token for internal repo access
uses: PelionIoT/actions/.github/actions/git-config@main
with:
github_token: ${{ secrets.ACCESS_TOKEN }}
- run: sudo apt install golint
- run: git clone [email protected]:PelionIoT/scripts-internal.git
- name: Build all
run: scripts-internal/golang/go_build_script.sh --all
run: go build ./...
- name: Run make.sh test (go vet + go test)
run: ./make.sh test
- name: Cleanup .gitconfig
if: always()
run: rm -f ~/.gitconfig
- name: Remove vendor folder & run golint
run: |
rm -rf vendor
sudo apt-get update && sudo apt-get install golint
golint ./...
pysh-check:
runs-on: ubuntu-latest
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

name: Build
on:
push:
workflow_dispatch:
schedule:
# Once week 06:18 on Saturday
- cron: '18 6 * * Sat'

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: pe-terminal-'${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

jobs:
build:
runs-on: ["self-hosted", "client"]
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Set up golang
uses: actions/setup-go@v5
with:
go-version: '1.20'
- name: Golang version
run: go version
- name: go build
run: go build ./...
- name: Run make.sh test (go vet + go test)
run: ./make.sh test
- name: Post status to Slack testing_builds
if: always()
uses: act10ns/slack@v2
with:
status: ${{ job.status }}
channel: '#testing_builds'
22 changes: 22 additions & 0 deletions .github/workflows/misspell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Misspell
on:
push:
workflow_dispatch:

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: misspell-'${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
cancel-in-progress: true

jobs:
misspell:
runs-on: ["self-hosted", "client"]
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Remove vendor folder!
run: rm -rf vendor
- name: Misspell
uses: PelionIoT/actions/.github/actions/misspell@main
with:
exceptions: "mosquitto"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/PelionIoT/pe-terminal)](https://goreportcard.com/report/github.com/PelionIoT/pe-terminal)

Terminal-client for Izuma Edge Gateways, (formerly [relay-term](https://github.com/PelionIoT/edge-node-modules/tree/master/relay-term)).
NOTE! Requires in minmimum `go` version 1.16.
NOTE! Requires in minmimum `go` version 1.20.

## How to

Expand Down
13 changes: 5 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
module github.com/PelionIoT/pe-terminal

go 1.18
go 1.20

require (
github.com/creack/pty v1.1.18
github.com/gorilla/websocket v1.5.0
go.uber.org/zap v1.24.0
github.com/creack/pty v1.1.21
github.com/gorilla/websocket v1.5.3
go.uber.org/zap v1.27.0
)

require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
)
require go.uber.org/multierr v1.10.0 // indirect
33 changes: 10 additions & 23 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
54 changes: 54 additions & 0 deletions vendor/github.com/creack/pty/.editorconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6ed14e3

Please sign in to comment.