Skip to content

Commit

Permalink
Merge pull request #60 from zoncoen/protobuf
Browse files Browse the repository at this point in the history
fix(extractor/protobuf): fix go.mod
  • Loading branch information
zoncoen authored Jan 25, 2024
2 parents e94950d + d12aed9 commit 20ae25e
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 20 deletions.
30 changes: 29 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
query-extractor-yaml:
strategy:
matrix:
go-version: [1.19.x, 1.20.x]
go-version: [1.20.x, 1.21.x]
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -48,11 +48,35 @@ jobs:
name: query-extractor-yaml-coverage-report
path: ./extractor/yaml/coverage.out

query-extractor-protobuf:
strategy:
matrix:
go-version: [1.20.x, 1.21.x]
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./extractor/protobuf
steps:
- name: Install Go
uses: actions/[email protected]
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
uses: actions/checkout@v4
- name: Test
run: go test -race ./... -coverpkg=./... -coverprofile=coverage.out -covermode=atomic
- uses: actions/upload-artifact@v4
if: startsWith(matrix.go-version, '1.20')
with:
name: query-extractor-protobuf-coverage-report
path: ./extractor/protobuf/coverage.out

collect-metrics:
name: collect metrics
needs:
- query
- query-extractor-yaml
- query-extractor-protobuf
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -65,4 +89,8 @@ jobs:
with:
name: query-extractor-yaml-coverage-report
path: ./extractor/yaml/coverage.out
- uses: actions/download-artifact@v4
with:
name: query-extractor-protobuf-coverage-report
path: ./extractor/protobuf/coverage.out
- uses: k1LoW/octocov-action@v1
11 changes: 3 additions & 8 deletions extractor/protobuf/go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
module github.com/zoncoen/query-go/extractor/protobuf

go 1.21.6
go 1.20

require (
github.com/zoncoen/query-go v1.3.0
github.com/zoncoen/query-go/extractor/protobuf/testdata/gen v0.0.0-00010101000000-000000000000
google.golang.org/protobuf v1.32.0
)

replace github.com/zoncoen/query-go/extractor/protobuf/testdata/gen => ./testdata/gen/

require (
github.com/pkg/errors v0.9.1 // indirect
google.golang.org/protobuf v1.32.0 // indirect
)
require github.com/pkg/errors v0.9.1 // indirect
5 changes: 0 additions & 5 deletions extractor/protobuf/testdata/gen/go.mod

This file was deleted.

6 changes: 0 additions & 6 deletions extractor/protobuf/testdata/gen/go.sum

This file was deleted.

0 comments on commit 20ae25e

Please sign in to comment.