From dbd23ed612d77102d2ace76351f692e798dfcdfe Mon Sep 17 00:00:00 2001 From: Samir Faci Date: Tue, 15 Oct 2024 08:54:28 -0400 Subject: [PATCH] Addressing code review comments --- .circleci/config.yml | 4 ++-- .github/workflows/code_scanner.yml | 13 +++++-------- go.mod | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 563616f..74f2bd8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: build_and_tests: docker: # specify the version - - image: cimg/go:1.22.2 + - image: cimg/go:1.22.8 - image: cimg/postgres:14.10 environment: POSTGRES_USER: jet @@ -134,7 +134,7 @@ jobs: - run: name: Running tests - command: gotestsum --junitfile report.xml --format testname -- -coverprofile=cover.out -covermode=atomic -coverpkg=github.com/go-jet/jet/v2/postgres/...,github.com/go-jet/jet/v2/mysql/...,github.com/go-jet/jet/v2/sqlite/...,github.com/go-jet/jet/v2/qrm/...,github.com/go-jet/jet/v2/generator/...,github.com/go-jet/jet/v2/internal/... ./... + command: gotestsum --junitfile $TEST_RESULTS/report.xml --format testname -- -coverprofile=cover.out -covermode=atomic -coverpkg=github.com/go-jet/jet/v2/postgres/...,github.com/go-jet/jet/v2/mysql/...,github.com/go-jet/jet/v2/sqlite/...,github.com/go-jet/jet/v2/qrm/...,github.com/go-jet/jet/v2/generator/...,github.com/go-jet/jet/v2/internal/... ./... # run mariaDB and cockroachdb tests. No need to collect coverage, because coverage is already included with mysql and postgres tests - run: MY_SQL_SOURCE=MariaDB go test -v ./tests/mysql/ diff --git a/.github/workflows/code_scanner.yml b/.github/workflows/code_scanner.yml index affc756..d4ecc5d 100644 --- a/.github/workflows/code_scanner.yml +++ b/.github/workflows/code_scanner.yml @@ -7,14 +7,11 @@ on: branches: - master -env: - GO_VERSION: 1.22.0 - - permissions: contents: read - # Optional: allow read access to pull request. Use with `only-new-issues` option. - # pull-requests: read + +env: + go_version: "1.22.8" jobs: @@ -25,7 +22,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: ${{ env.go_version }} cache: true - name: Setup Tools run: | @@ -39,7 +36,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: ${{ env.go_version }} cache: true - name: Setup Tools run: | diff --git a/go.mod b/go.mod index ffa977e..890dc0d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/go-jet/jet/v2 -go 1.22.0 +go 1.18 require ( github.com/go-sql-driver/mysql v1.8.1