Skip to content

Commit

Permalink
update workflow and go package versions (#121)
Browse files Browse the repository at this point in the history
* bump versions

* bump go packages
  • Loading branch information
briangann committed Mar 7, 2024
1 parent d135fed commit 33326c9
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 67 deletions.
27 changes: 13 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,26 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: 1.21.4
cache: true
go-version-file: go.mod
check-latest: true

- name: Install dependencies
run: go get .

- name: Install golangci-lint
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
uses: golangci/golangci-lint-action@v4
with:
version: latest
args: --exclude-use-default
skip-cache: true
skip-pkg-cache: true

- name: Run Gosec Security Scanner
uses: securego/gosec@master
Expand All @@ -40,26 +45,20 @@ jobs:
echo "SOURCE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
- name: Build with Mage
uses: magefile/mage-action@v2
uses: magefile/mage-action@v3
with:
version: latest
args: -v build:ci

- name: Upload Code Climate Report
uses: paambaati/codeclimate-action@v3.2.0
uses: paambaati/codeclimate-action@v5.0.0
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
with:
prefix: github.com/grafana/grafana-kiosk
coverageLocations: |
${{github.workspace}}/coverage.out:gocov
#- name: Test Step Variables
# run: |
# echo Source Name ${{ steps.branch_name.outputs.SOURCE_NAME }}
# echo Source Branch ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
# echo Source Tag ${{ steps.branch_name.outputs.SOURCE_TAG }}

- name: Package Release
id: package-release
if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -84,7 +83,7 @@ jobs:
mv grafana-kiosk-$SOURCE_TAG.zip $RELEASE_TARGET_DIR
- name: Upload Release Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: startsWith(github.ref, 'refs/tags/v')
with:
name: upload-release-artifacts
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/osv-scanner-pr.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: OSV-Scanner PR Scan

# Change "main" to your default branch if you use a different name, i.e. "master"
on:
pull_request:
branches: [ main ]
Expand All @@ -16,4 +16,3 @@ permissions:
jobs:
scan-pr:
uses: "google/osv-scanner/.github/workflows/osv-scanner-reusable-pr.yml@main"

4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6
- uses: actions/stale@v9
with:
# Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to -1 to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
Expand All @@ -29,4 +29,4 @@ jobs:
close-pr-message: >
This pull request has been automatically closed because it has not had
activity in the last 2 weeks. Please feel free to give a status update now, ping for review, or re-open when it's ready.
Thank you for your contributions!
Thank you for your contributions!
37 changes: 23 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,47 +1,56 @@
module github.com/grafana/grafana-kiosk

go 1.21
go 1.22

require (
github.com/chromedp/cdproto v0.0.0-20231126232103-8e31ff06e23b
github.com/chromedp/chromedp v0.9.3
github.com/chromedp/cdproto v0.0.0-20240304214822-eeb3d13057c9
github.com/chromedp/chromedp v0.9.5
github.com/ilyakaznacheev/cleanenv v1.5.0
github.com/magefile/mage v1.15.0
github.com/smartystreets/goconvey v1.8.1
google.golang.org/api v0.168.0
)

require (
cloud.google.com/go/compute v1.23.3 // indirect
cloud.google.com/go/compute v1.25.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/smarty/assertions v1.15.1 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/chromedp/sysutil v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.3.1 // indirect
github.com/gobwas/ws v1.3.2 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
golang.org/x/sys v0.15.0 // indirect
google.golang.org/api v0.152.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/sys v0.18.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect
)
Loading

0 comments on commit 33326c9

Please sign in to comment.