diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index cdba02b..fb91a43 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -1,6 +1,6 @@ name: Test and coverage -on: [push, pull_request] +on: [push] permissions: # added using https://github.com/step-security/secure-workflows contents: read @@ -12,21 +12,21 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c with: - egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs + egress-policy: audit - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 with: fetch-depth: 2 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: '1.18' + go-version: '1.20' - name: Run coverage run: make calculate_coverage - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_TOKEN } + token: ${{ secrets.CODECOV_TOKEN }} version: "v0.1.15" verbose: true fail_ci_if_error: true diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 388b1ec..52aef2c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,4 +1,4 @@ -on: [ push ] +on: [push] name: Go tests permissions: # added using https://github.com/step-security/secure-workflows contents: read @@ -7,7 +7,7 @@ jobs: Build-and-test: strategy: matrix: - go-version: [1.17.x, 1.18.x, 1.19.x, 1.20.x, 1.21.x, 1.22.x] + go-version: [1.20.x, 1.21.x, 1.22.x] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 387688e..da46924 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -1,5 +1,5 @@ name: golangci-lint -on: [push ] +on: [push] permissions: # added using https://github.com/step-security/secure-workflows contents: read diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 2622edd..90d6fa5 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -1,5 +1,5 @@ name: MySQL tests -on: [ push ] +on: [push] permissions: # added using https://github.com/step-security/secure-workflows contents: read @@ -26,8 +26,7 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c with: - # egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - egress-policy: block + egress-policy: audit allowed-endpoints: > api.github.com:443 codecov.io:443 @@ -44,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: 1.16 + go-version: '1.20' - name: Build run: go build -v ./... @@ -62,7 +61,7 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_TOKEN } + token: ${{ secrets.CODECOV_TOKEN }} version: "v0.1.15" verbose: true fail_ci_if_error: true diff --git a/.github/workflows/pg.yml b/.github/workflows/pg.yml index 57706c7..83e7a8a 100644 --- a/.github/workflows/pg.yml +++ b/.github/workflows/pg.yml @@ -1,5 +1,5 @@ name: PostgreSQL tests -on: [ push ] +on: [push] permissions: # added using https://github.com/step-security/secure-workflows contents: read @@ -25,7 +25,7 @@ jobs: - name: Harden Runner uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c with: - egress-policy: block + egress-policy: audit allowed-endpoints: > api.github.com:443 codecov.io:443 @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: 1.16 + go-version: '1.20' - name: Build run: go build -v ./... @@ -60,8 +60,8 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_TOKEN } - version: "v0.1.15" + token: ${{ secrets.CODECOV_TOKEN }} + #version: "v0.1.15" verbose: true fail_ci_if_error: true flags: pg_tests diff --git a/.github/workflows/s2.yml b/.github/workflows/s2.yml index b570c06..edac843 100644 --- a/.github/workflows/s2.yml +++ b/.github/workflows/s2.yml @@ -1,5 +1,5 @@ name: SingleStore tests -on: [ push ] +on: [push] permissions: # added using https://github.com/step-security/secure-workflows contents: read @@ -41,7 +41,7 @@ jobs: - name: Set up Go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 with: - go-version: 1.16 + go-version: '1.20' - name: Build run: go build -v ./... @@ -59,7 +59,7 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_TOKEN } + token: ${{ secrets.CODECOV_TOKEN }} version: "v0.1.15" verbose: true fail_ci_if_error: true diff --git a/go.mod b/go.mod index 5167ede..9807ec5 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,23 @@ module github.com/muir/libschema -go 1.16 +go 1.20 require ( - github.com/go-sql-driver/mysql v1.7.1 + github.com/go-sql-driver/mysql v1.8.1 github.com/hashicorp/go-multierror v1.1.1 - github.com/kr/pretty v0.1.0 // indirect github.com/lib/pq v1.10.9 github.com/muir/sqltoken v0.0.5 github.com/muir/testinglogur v0.0.1 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.9.0 +) + +require ( + filippo.io/edwards25519 v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/kr/pretty v0.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 1e155fd..01abb2e 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,11 @@ +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= -github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= @@ -25,13 +27,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=