Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-actions: fix failing loggers tests on macos #418

Merged
merged 6 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
bench-dnstaptcp:
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
- uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- uses: actions/checkout@v4
with:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,28 @@ jobs:

strategy:
matrix:
go-version: ['1.19', '1.20', '1.21']
go-version: ['1.20', '1.21']

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go

# for macos and window, limit the build to the latest version
go-macos:
runs-on: macos-latest

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21' ]
go-version: [ '1.21' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand All @@ -53,11 +54,11 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21' ]
go-version: [ '1.21' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: '1.21'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: "1.21"

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/testing-dnstap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20' ]
unbound: [ '1.16.0', '1.17.0', '1.18.0' ]
go-version: [ '1.21' ]
unbound: [ '1.17.0', '1.18.0' ]

mode: [ 'tcp' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
Expand All @@ -55,18 +55,18 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21' ]
go-version: [ '1.21' ]
coredns: [ '1.10.1', '1.11.1' ]
mode: [ 'tcp' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
Expand All @@ -87,18 +87,18 @@ jobs:

strategy:
matrix:
go-version: [ '1.20', '1.21' ]
go-version: [ '1.21' ]
coredns: [ '1.11.1' ]
mode: [ 'tls' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
Expand Down Expand Up @@ -131,19 +131,19 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21' ]
go-version: [ '1.21' ]
dnsdist: [ '17', '18', '19' ]

mode: [ 'dnstaptcp', 'dnstapunix' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
with:
python-version: 3.11
python-version: 3.12

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/testing-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,18 @@ jobs:
dev:
strategy:
matrix:
os-version: ['ubuntu-22.04', 'macos-12']
os-version: ['ubuntu-22.04', 'macos-latest' ]
go-version: ['1.19', '1.20', '1.21']
package: ['dnsutils', 'collectors', 'loggers', 'transformers', 'netlib']
exclude:
- os-version: macos-latest
go-version: '1.20'

runs-on: ${{ matrix.os-version }}

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand All @@ -48,24 +51,24 @@ jobs:
sudo go version

- name: Test ${{ matrix.package }}
run: sudo go test -timeout 60s ./${{ matrix.package }}/ -race -cover -v
run: sudo go test -timeout 90s ./${{ matrix.package }}/ -race -cover -v

int:
runs-on: ubuntu-22.04

strategy:
matrix:
go-version: ['1.19', '1.20', '1.21']
go-version: ['1.20', '1.21']
package: ['config', 'clientquery_dnstaptcp', 'clientquery_dnstapunix' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- name: build binary
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
Expand All @@ -81,11 +84,11 @@ jobs:

strategy:
matrix:
go-version: ['1.19', '1.20', '1.21']
go-version: ['1.21']

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/testing-powerdns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21']
go-version: [ '1.21' ]
dnsdist: [ '17', '18', '19' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
Expand All @@ -51,12 +51,12 @@ jobs:

strategy:
matrix:
go-version: [ '1.19', '1.20', '1.21' ]
go-version: [ '1.21' ]
recursor: [ '47', '48', '49' ]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v3
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}
- uses: actions/setup-python@v4
Expand Down
Loading