Compare commits

..

No commits in common. "master" and "v0.2.1" have entirely different histories.

5 changed files with 14 additions and 43 deletions

View File

@ -9,16 +9,13 @@ on:
jobs: jobs:
unittest: unittest:
runs-on: ${{ matrix.os }} runs-on:
strategy: - ubuntu-latest
matrix:
go: [ stable ]
os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
steps: steps:
- uses: actions/checkout@v4.2.2 - uses: actions/checkout@v4.2.2
- uses: actions/setup-go@v5.5.0 - uses: actions/setup-go@v5.5.0
with: with:
go-version: ${{ matrix.go }} go-version: stable
- env: - env:
GOPROXY: ${{ vars.GOPROXY }} GOPROXY: ${{ vars.GOPROXY }}
run: make test/unit run: make test/unit

View File

@ -1,27 +0,0 @@
name: Golang CI lint
on:
pull_request:
types: [ "opened", "reopened", "synchronize" ]
push:
branches: [ '**' ]
tags-ignore: [ '**' ]
permissions:
contents: read
jobs:
golangci:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go: [ stable ]
os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/setup-go@v5.5.0
with:
go-version: ${{ matrix.go }}
- uses: golangci/golangci-lint-action@v8.0.0
with:
version: v2.1

View File

@ -1,18 +1,20 @@
name: 'Lint Markdown files' name: Markdown linter
on: on:
pull_request: pull_request:
types: [ "opened", "reopened", "synchronize" ] types: [ "opened", "reopened", "synchronize" ]
push: push:
branches: [ '*' ] branches: [ '**' ]
tags-ignore: [ '*' ] tags-ignore: [ '**' ]
workflow_dispatch: {}
jobs: jobs:
markdown-lint: markdown-lint:
container:
image: git.cryptic.systems/volker.raschek/markdownlint:0.45.0
runs-on: runs-on:
- ubuntu-latest - ubuntu-latest
steps: steps:
- uses: actions/checkout@v4.2.2 - uses: actions/checkout@v4.2.2
- uses: DavidAnson/markdownlint-cli2-action@v20.0.0 - name: Lint Markdown files
with: run: markdownlint --config .markdownlint.yaml .
globs: '**/*.md'

View File

@ -4,7 +4,6 @@ on:
push: push:
branches: [ 'master' ] branches: [ 'master' ]
paths: [ 'README.md' ] paths: [ 'README.md' ]
workflow_dispatch: {}
jobs: jobs:
update-description-on-hub-docker-io: update-description-on-hub-docker-io:
@ -16,5 +15,5 @@ jobs:
with: with:
username: ${{ secrets.DOCKER_IO_USERNAME }} username: ${{ secrets.DOCKER_IO_USERNAME }}
password: ${{ secrets.DOCKER_IO_PASSWORD }} password: ${{ secrets.DOCKER_IO_PASSWORD }}
repository: volkerraschek/db-wait repository: volkerraschek/dcmerge
readme-filepath: README.md readme-filepath: README.md

View File

@ -64,8 +64,8 @@ LOOP:
case "postgres": case "postgres":
row := sqlDB.QueryRowContext(queryCtx, "SELECT 1 AS ROW") row := sqlDB.QueryRowContext(queryCtx, "SELECT 1 AS ROW")
err := row.Err() err := row.Err()
switch err { switch {
case nil: case err == nil:
return nil return nil
default: default:
fmt.Fprintf(os.Stderr, "%s: %s\n", time.Now().String(), err.Error()) fmt.Fprintf(os.Stderr, "%s: %s\n", time.Now().String(), err.Error())