diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 13ee4b86..514fa626 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -7,31 +7,44 @@ on: pull_request: branches: - main + schedule: + - cron: '40 1 * * 2' jobs: test: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: "go.mod" - - run: go run github.com/onsi/ginkgo/v2/ginkgo -r --procs=3 --compilers=3 --randomize-all --randomize-suites --fail-on-pending --keep-going --race --trace + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version-file: "go.mod" + - run: go run github.com/onsi/ginkgo/v2/ginkgo -r --procs=3 --compilers=3 --randomize-all --randomize-suites --fail-on-pending --keep-going --race --trace vet: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: "go.mod" - - run: go vet ./... + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version-file: "go.mod" + - run: go vet ./... lint: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version-file: "go.mod" - - uses: golangci/golangci-lint-action@v3.2.0 + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version-file: "go.mod" + - uses: golangci/golangci-lint-action@v3.2.0 + with: + args: --timeout 5m diff --git a/integration/syslog_test.go b/integration/syslog_test.go index 558b93a6..fbe8e903 100644 --- a/integration/syslog_test.go +++ b/integration/syslog_test.go @@ -215,7 +215,7 @@ var _ = Describe("Blackbox", func() { var message *sl.Message Eventually(inbox.Messages, "5s").Should(Receive(&message)) - Expect(message.Content).To(ContainSubstring(tagName + "/" + logfileName)) + Expect(message.Content).To(MatchRegexp(tagName + `[/\\]` + logfileName)) blackboxRunner.Stop() }) @@ -249,7 +249,7 @@ var _ = Describe("Blackbox", func() { blackboxRunner.Stop() }) It("removes all characters that are not between ASCII 33 - 126 from the tag name", func() { - specialCharsName := "ab c§d " + specialCharsName := "ab c§d" expectedNoSpecialCharsName := "abcd" err := os.Mkdir(filepath.Join(logDir, specialCharsName), os.ModePerm)