fix and cleanup a few workflows, use latest version of sqlc (#128)

capnspacehook · Aug 11, 2023 · 71832c8 · 71832c8
1 parent 36cb2b7
commit 71832c8
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 24 deletions.
diff --git a/.github/workflows/constants.env → .github/constants.env b/.github/workflows/constants.env → .github/constants.env
diff --git a/.github/workflows/check-generated.yml b/.github/workflows/check-generated.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -32,9 +32,6 @@ jobs:
           check-latest: true
           cache: true
 
-      - run: |
-          go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
-
       - name: Ensure 'go generate' is clean
         run: |
           # shellcheck disable=SC2046

diff --git a/.github/workflows/lint-actions.yml b/.github/workflows/lint-actions.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4

diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -50,7 +50,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -67,16 +67,14 @@ jobs:
   golangci-lint:
     runs-on: ubuntu-latest
     timeout-minutes: 15
-    permissions:
-      pull-requests: read
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -87,5 +85,3 @@ jobs:
 
       - name: Lint with golangci-lint
         uses: golangci/[email protected]
-        with:
-          only-new-issues: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Checkout tags
         run: git fetch --force --tags

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -47,7 +47,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
@@ -75,7 +75,7 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Docker buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.github/workflows/vuln.yml b/.github/workflows/vuln.yml
@@ -23,16 +23,15 @@ jobs:
       - name: Export constant environmental variables
         uses: cardinalby/export-env-action@v2
         with:
-          envFile: .github/workflows/constants.env
+          envFile: .github/constants.env
 
       - name: Install Go
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}.x
           check-latest: true
-          cache: true
 
       - name: Scan for known vulnerable dependencies
         run: |
           go install golang.org/x/vuln/cmd/govulncheck@latest
-          govulncheck -v ./...
+          govulncheck ./...
diff --git a/database/db.go b/database/db.go
diff --git a/database/models.go b/database/models.go
diff --git a/database/querier.go b/database/querier.go
diff --git a/database/query.sql.go b/database/query.sql.go
diff --git a/db.go b/db.go
@@ -7,7 +7,7 @@ import (
 	"github.com/capnspacehook/whalewall/database"
 )
 
-//go:generate sqlc generate
+//go:generate go run github.com/sqlc-dev/sqlc/cmd/[email protected] generate
 
 func (r *RuleManager) containerExists(ctx context.Context, db database.Querier, id string) (bool, error) {
 	exists, err := db.ContainerExists(ctx, id)