From 84f76c197a4dc32a8abe6adb13f07eed1a4d11cd Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 1 Jan 2024 00:37:12 +0800 Subject: [PATCH] Fix ci --- .gitea/workflows/test-mssql-collation.yml | 58 +++++++++++++++++++++++ .gitea/workflows/test-mssql.yml | 8 ---- tests/tests.go | 1 + 3 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 .gitea/workflows/test-mssql-collation.yml diff --git a/.gitea/workflows/test-mssql-collation.yml b/.gitea/workflows/test-mssql-collation.yml new file mode 100644 index 00000000..552f43a1 --- /dev/null +++ b/.gitea/workflows/test-mssql-collation.yml @@ -0,0 +1,58 @@ +name: test mssql +on: + push: + branches: + - master + pull_request: + +env: + GOPROXY: https://goproxy.io,direct + GOPATH: /go_path + GOCACHE: /go_cache + RUNNER_TOOL_CACHE: /toolcache # specify with your cache path + +jobs: + test-mssql-collation: + name: test mssql with collation + runs-on: ubuntu-latest + steps: + # - name: cache go path + # id: cache-go-path + # uses: https://github.com/actions/cache@v3 + # with: + # path: /go_path + # key: go_path-${{ github.repository }}-${{ github.ref_name }} + # restore-keys: | + # go_path-${{ github.repository }}- + # go_path- + # - name: cache go cache + # id: cache-go-cache + # uses: https://github.com/actions/cache@v3 + # with: + # path: /go_cache + # key: go_cache-${{ github.repository }}-${{ github.ref_name }} + # restore-keys: | + # go_cache-${{ github.repository }}- + # go_cache- + - uses: actions/setup-go@v3 + with: + go-version: 1.20 + - uses: actions/checkout@v3 + - name: test mssql with collation + env: + TEST_MSSQL_HOST: mssql2 + TEST_MSSQL_DBNAME: xorm_test + TEST_MSSQL_USERNAME: sa + TEST_MSSQL_PASSWORD: "yourStrong(!)Password" + TEST_MSSQL_COLLATION: SQL_Latin1_General_CP1_CS_AS + run: TEST_MSSQL_DEFAULT_VARCHAR=NVARCHAR TEST_MSSQL_DEFAULT_CHAR=NCHAR make test-mssql + + services: + mssql2: + image: mcr.microsoft.com/mssql/server:latest + env: + ACCEPT_EULA: Y + SA_PASSWORD: yourStrong(!)Password + MSSQL_PID: Standard + ports: + - 1433:1433 \ No newline at end of file diff --git a/.gitea/workflows/test-mssql.yml b/.gitea/workflows/test-mssql.yml index 78fe6528..c5baf194 100644 --- a/.gitea/workflows/test-mssql.yml +++ b/.gitea/workflows/test-mssql.yml @@ -45,14 +45,6 @@ jobs: TEST_MSSQL_USERNAME: sa TEST_MSSQL_PASSWORD: "yourStrong(!)Password" run: TEST_MSSQL_DEFAULT_VARCHAR=NVARCHAR TEST_MSSQL_DEFAULT_CHAR=NCHAR make test-mssql - - name: test mssql with collation - env: - TEST_MSSQL_HOST: mssql - TEST_MSSQL_DBNAME: xorm_test2 - TEST_MSSQL_USERNAME: sa - TEST_MSSQL_PASSWORD: "yourStrong(!)Password" - TEST_MSSQL_COLLATION: SQL_Latin1_General_CP1_CS_AS - run: TEST_MSSQL_DEFAULT_VARCHAR=NVARCHAR TEST_MSSQL_DEFAULT_CHAR=NCHAR make test-mssql services: mssql: diff --git a/tests/tests.go b/tests/tests.go index 290af0a7..d0260674 100644 --- a/tests/tests.go +++ b/tests/tests.go @@ -51,6 +51,7 @@ func createEngine(dbType, connStr string) error { if !*cluster { switch schemas.DBType(strings.ToLower(dbType)) { case schemas.MSSQL: + dialects.connStr db, err := sql.Open(dbType, strings.ReplaceAll(connStr, "xorm_test", "master")) if err != nil { return err