Skip to content

Commit

Permalink
Merge pull request #89 from DopplerHQ/nic/go-1-22
Browse files Browse the repository at this point in the history
Update Go version to v1.22
  • Loading branch information
nmanoogian authored Jun 24, 2024
2 parents be3ccbc + 785f846 commit 113ed3c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 33 deletions.
23 changes: 9 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
# This GitHub action can publish assets for release when a tag is created.
# Currently its setup to run on any tag that matches the pattern "v*" (ie. v0.1.0).
#
# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
# This uses an action (paultyng/ghaction-import-gpg) that assumes you set your
# private key in the `GPG_PRIVATE_KEY` secret and passphrase in the `PASSPHRASE`
# secret. If you would rather own your own GPG handling, please fork this action
# or use an alternative one for key handling.
#
# You will need to pass the `--batch` flag to `gpg` in your signing step
# You will need to pass the `--batch` flag to `gpg` in your signing step
# in `goreleaser` to indicate this is being used in a non-interactive mode.
#
name: release
on:
push:
tags:
- 'v*'
- "v*"
jobs:
goreleaser:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
-
name: Checkout
- name: Checkout
uses: actions/checkout@v4
-
name: Unshallow
- name: Unshallow
run: git fetch --prune --unshallow
-
name: Set up Go
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21
-
name: Import GPG key
go-version: 1.22
- name: Import GPG key
id: import_gpg
# TODO: move this to HashiCorp namespace or find alternative that is just simple gpg commands
# see https://github.com/hashicorp/terraform-provider-scaffolding/issues/22
Expand All @@ -41,8 +37,7 @@ jobs:
# These secrets will need to be configured for the repository:
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-
name: Run GoReleaser
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v5
with:
version: latest
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/salus.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
schedule:
- cron: '0 0 * * *'
- cron: "0 0 * * *"

name: Salus security scan

Expand All @@ -22,17 +22,17 @@ jobs:
runs-on: ubuntu-latest
name: Salus Security Scan
steps:
- uses: actions/checkout@v4
- name: Salus Scan
id: salus_scan
uses: federacy/scan-action@0.1.5
env:
SALUS_CONFIGURATION: "file://salus-config.yaml"
with:
report_uri: file://./salus-report.txt
report_format: txt
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Scan results
path: ./salus-report.txt
- uses: actions/checkout@v4
- name: Salus Scan
id: salus_scan
uses: federacy/scan-action@0.1.5
env:
SALUS_CONFIGURATION: "file://salus-config.yaml"
with:
report_uri: file://./salus-report.txt
report_format: txt
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Scan results
path: ./salus-report.txt
4 changes: 2 additions & 2 deletions .github/workflows/vulncheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
schedule:
- cron: '28 1 * * *'
- cron: "28 1 * * *"

jobs:
vulncheck:
Expand All @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: "1.22"
check-latest: true
- name: Get official govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest
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/DopplerHQ/terraform-provider-doppler

go 1.21
go 1.22

require github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0

Expand Down
2 changes: 1 addition & 1 deletion salus-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ enforced_scanners: "all"
scanner_configs:
GoVersionScanner:
error:
min_version: '1.21.0'
min_version: "1.22.0"

0 comments on commit 113ed3c

Please sign in to comment.