Skip to content

Commit

Permalink
Revert ":pushpin: Pinned default's to latest govulncheck (1.0) and go…
Browse files Browse the repository at this point in the history
…lang 1.20.6 (#46)" (#47)

This reverts commit 80b479b.
  • Loading branch information
Templum authored Jul 18, 2023
1 parent 80b479b commit b711cfd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
RUN go install golang.org/x/tools/gopls@latest

# Installing govulncheck
ARG VULNCHECK_VERSION="v1.0.0"
ARG VULNCHECK_VERSION="v0.1.0"
RUN go install golang.org/x/vuln/cmd/govulncheck@$VULNCHECK_VERSION


Expand Down
9 changes: 4 additions & 5 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"VARIANT": "1.20-bullseye",
// Options
"NODE_VERSION": "none",
"VULNCHECK_VERSION": "v1.0.0"
"VULNCHECK_VERSION": "v0.1.0"
}
},
"runArgs": [
Expand All @@ -22,19 +22,18 @@
"customizations": {
"vscode": {
"settings": {
"go.useLanguageServer": true,
"go.gocodeAutoBuild": false,
"files.autoSave": "afterDelay",
"editor.formatOnPaste": true,
"editor.formatOnSave": true,
"gopls": {
"ui.completion.usePlaceholders": true
},
"go.gopath": "/go",
"go.goroot": "/usr/local/go",
"go.toolsGopath": "/go/bin",
"go.buildOnSave": "workspace",
"go.lintOnSave": "package",
"go.vetOnSave": "package",
"go.coverOnSave": false,
"go.useCodeSnippetsOnFunctionSuggest": false,
"go.lintTool": "golangci-lint",
"go.formatTool": "goimports",
"[go]": {
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.20
ARG GOLANG_VERSION=1.19
# This golang version is for the builder only
FROM golang:1.20 as builder

Expand All @@ -13,7 +13,7 @@ COPY . .
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -v -o action .
# This golang version determines in which golang environment the customer code is checked
FROM golang:$GOLANG_VERSION
ARG VULNCHECK_VERSION=v1.0.0
ARG VULNCHECK_VERSION=v0.1.0
RUN go install golang.org/x/vuln/cmd/govulncheck@$VULNCHECK_VERSION

# This allows private repositories hosted on Github
Expand Down
6 changes: 3 additions & 3 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ inputs:
required: false
default: "./..."
go-version:
description: "Can be any Tag for the golang docker image, but should ideally match your runtime go version. By default 1.20.6 is assumed"
description: "Can be any Tag for the golang docker image, but should ideally match your runtime go version. By default 1.19 is assumed"
required: false
default: "1.20.6"
default: "1.19"
vulncheck-version:
description: "Version of govulncheck that should be used, by default v0.0.0-20230331150530-a42f9910daf3"
required: false
default: "v1.0.0"
default: "v0.0.0-20230331150530-a42f9910daf3"
github-token:
description: "Github App token to upload sarif report. Needs write permissions for security_events. By default it will use 'github.token' value"
default: ${{ github.token }}
Expand Down

0 comments on commit b711cfd

Please sign in to comment.