Skip to content

Commit a541237

Browse files
committed
chore: add workflow
1 parent 8ce511b commit a541237

4 files changed

Lines changed: 49 additions & 6 deletions

File tree

.github/workflows/go.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: go
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
env:
12+
GOPRIVATE: github.com/NextronSystems/
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-go@v5
19+
with:
20+
go-version: stable
21+
- name: Configure Git credentials for private modules
22+
run: |
23+
git config --global url."https://${{ secrets.GITHUB_TOKEN }}@github.com/".insteadOf "https://github.com/"
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
- name: Set Go environment for private modules
27+
run: |
28+
echo "GOPRIVATE=github.com/NextronSystems/*" >> $GITHUB_ENV
29+
- name: Test
30+
run: go test -v ./...
31+
lint:
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v4
35+
- uses: actions/setup-go@v5
36+
with:
37+
go-version: stable
38+
- name: Lint
39+
uses: golangci/golangci-lint-action@v8
40+
with:
41+
version: v2.1.6

thorlog/jsonschema/go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
module gitlab.nextron/nextron-research/jsonlog/thorlog/jsonschema
1+
module github.com/NextronSystems/jsonlog/thorlog/jsonschema
22

33
go 1.23.1
44

55
require (
6-
github.com/NextronSystems/jsonlog v0.0.0-20240927093204-3ba6fa967aa2
6+
github.com/NextronSystems/jsonlog v0.0.0-20250522074152-0a205b123911
77
github.com/invopop/jsonschema v0.12.0
88
github.com/wk8/go-ordered-map/v2 v2.1.8
99
)
@@ -17,3 +17,5 @@ require (
1717
golang.org/x/mod v0.15.0 // indirect
1818
gopkg.in/yaml.v3 v3.0.1 // indirect
1919
)
20+
21+
replace github.com/NextronSystems/jsonlog => ../../

thorlog/jsonschema/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/NextronSystems/jsonlog v0.0.0-20240927093204-3ba6fa967aa2 h1:Zf5UV/1V+wA0F9rrpLZRL0Fvxi+9WuD9a0KsKnrAnmE=
2-
github.com/NextronSystems/jsonlog v0.0.0-20240927093204-3ba6fa967aa2/go.mod h1:Hk47VW018TX8o/0sxK+EJt16iRE7gB91zGZGiaAjcww=
1+
github.com/NextronSystems/jsonlog v0.0.0-20250522074152-0a205b123911 h1:jmmvwkhul9DtWWOBhyeyXV9LA4cQzqJ0UyniD3e/HZQ=
2+
github.com/NextronSystems/jsonlog v0.0.0-20250522074152-0a205b123911/go.mod h1:Hk47VW018TX8o/0sxK+EJt16iRE7gB91zGZGiaAjcww=
33
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
44
github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
55
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=

thorlog/parser/parser.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/NextronSystems/jsonlog/thorlog/common"
88
thorlogv1 "github.com/NextronSystems/jsonlog/thorlog/v1"
99
thorlogv2 "github.com/NextronSystems/jsonlog/thorlog/v2"
10-
"github.com/NextronSystems/jsonlog/thorlog/v3"
10+
thorlogv3 "github.com/NextronSystems/jsonlog/thorlog/v3"
1111
)
1212

1313
func ParseEvent(data []byte) (common.Event, error) {
@@ -32,7 +32,7 @@ func ParseEvent(data []byte) (common.Event, error) {
3232
}
3333
return &event, nil
3434
case common.JsonV3:
35-
var logObject thorlog.EmbeddedObject
35+
var logObject thorlogv3.EmbeddedObject
3636
if err := json.Unmarshal(data, &logObject); err != nil {
3737
return nil, err
3838
}

0 commit comments

Comments
 (0)