Skip to content

Commit dcd3c2e

Browse files
stuartpastuartpa
committed
Merge conflicts
2 parents f251bca + e397f4e commit dcd3c2e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+6448
-6446
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 79 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
12-
name: "CodeQL"
13-
14-
on:
15-
push:
16-
branches: [ "main" ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ "main" ]
20-
paths-ignore:
21-
- '**/*.md'
22-
- '**/*.txt'
23-
- '**/*.sql'
24-
25-
jobs:
26-
analyze:
27-
name: Analyze
28-
runs-on: ubuntu-latest
29-
permissions:
30-
actions: read
31-
contents: read
32-
security-events: write
33-
34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
language: [ 'go' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
41-
steps:
42-
- name: Checkout repository
43-
uses: actions/checkout@v3
44-
45-
- name: Setup go
46-
uses: actions/setup-go@v2
47-
with:
48-
go-version: '1.18'
49-
50-
# Initializes the CodeQL tools for scanning.
51-
- name: Initialize CodeQL
52-
uses: github/codeql-action/init@v2
53-
with:
54-
languages: ${{ matrix.language }}
55-
# If you wish to specify custom queries, you can do so here or in a config file.
56-
# By default, queries listed here will override any specified in a config file.
57-
# Prefix the list here with "+" to use these queries and those in the config file.
58-
59-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
60-
# queries: security-extended,security-and-quality
61-
62-
63-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
64-
# If this step fails, then you should remove it and run the build manually (see below)
65-
- name: Autobuild
66-
uses: github/codeql-action/autobuild@v2
67-
68-
# ℹ️ Command-line programs to run using the OS shell.
69-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
70-
71-
# If the Autobuild fails above, remove it and uncomment the following three lines.
72-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
73-
74-
# - run: |
75-
# echo "Run, Build Application using script"
76-
# ./location_of_script_within_repo/buildscript.sh
77-
78-
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@v2
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "main" ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ "main" ]
20+
paths-ignore:
21+
- '**/*.md'
22+
- '**/*.txt'
23+
- '**/*.sql'
24+
25+
jobs:
26+
analyze:
27+
name: Analyze
28+
runs-on: ubuntu-latest
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
33+
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language: [ 'go' ]
38+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40+
41+
steps:
42+
- name: Checkout repository
43+
uses: actions/checkout@v3
44+
45+
- name: Setup go
46+
uses: actions/setup-go@v2
47+
with:
48+
go-version: '1.18'
49+
50+
# Initializes the CodeQL tools for scanning.
51+
- name: Initialize CodeQL
52+
uses: github/codeql-action/init@v2
53+
with:
54+
languages: ${{ matrix.language }}
55+
# If you wish to specify custom queries, you can do so here or in a config file.
56+
# By default, queries listed here will override any specified in a config file.
57+
# Prefix the list here with "+" to use these queries and those in the config file.
58+
59+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
60+
# queries: security-extended,security-and-quality
61+
62+
63+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
64+
# If this step fails, then you should remove it and run the build manually (see below)
65+
- name: Autobuild
66+
uses: github/codeql-action/autobuild@v2
67+
68+
# ℹ️ Command-line programs to run using the OS shell.
69+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
70+
71+
# If the Autobuild fails above, remove it and uncomment the following three lines.
72+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
73+
74+
# - run: |
75+
# echo "Run, Build Application using script"
76+
# ./location_of_script_within_repo/buildscript.sh
77+
78+
- name: Perform CodeQL Analysis
79+
uses: github/codeql-action/analyze@v2

‎.github/workflows/golangci-lint.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
name: golangci-lint
2-
on:
3-
push:
4-
branches:
5-
- main
6-
pull_request:
7-
jobs:
8-
golangci-pr:
9-
name: lint-pr-changes
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: actions/setup-go@v3
13-
with:
14-
go-version: 1.18
15-
- uses: actions/checkout@v3
16-
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v3
18-
with:
19-
version: latest
20-
only-new-issues: true
1+
name: golangci-lint
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
7+
jobs:
8+
golangci-pr:
9+
name: lint-pr-changes
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/setup-go@v3
13+
with:
14+
go-version: 1.18
15+
- uses: actions/checkout@v3
16+
- name: golangci-lint
17+
uses: golangci/golangci-lint-action@v3
18+
with:
19+
version: latest
20+
only-new-issues: true

‎.github/workflows/pr-validation.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
name: pr-validation
2-
3-
on:
4-
pull_request:
5-
branches:
6-
- main
7-
8-
jobs:
9-
build:
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: actions/checkout@v2
13-
- name: Setup go
14-
uses: actions/setup-go@v2
15-
with:
16-
go-version: '1.18'
17-
- name: Run tests against Linux SQL
18-
run: |
19-
go version
20-
cd cmd/sqlcmd
21-
go get -d
22-
go build .
23-
export SQLCMDPASSWORD=$(date +%s|sha256sum|base64|head -c 32)
24-
export SQLCMDUSER=sa
25-
docker run -m 2GB -e ACCEPT_EULA=1 -d --name sql2017 -p:1433:1433 -e SA_PASSWORD=$SQLCMDPASSWORD mcr.microsoft.com/mssql/server:2017-latest
26-
cd ../..
27-
go test -v ./...
1+
name: pr-validation
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Setup go
14+
uses: actions/setup-go@v2
15+
with:
16+
go-version: '1.18'
17+
- name: Run tests against Linux SQL
18+
run: |
19+
go version
20+
cd cmd/sqlcmd
21+
go get -d
22+
go build .
23+
export SQLCMDPASSWORD=$(date +%s|sha256sum|base64|head -c 32)
24+
export SQLCMDUSER=sa
25+
docker run -m 2GB -e ACCEPT_EULA=1 -d --name sql2017 -p:1433:1433 -e SA_PASSWORD=$SQLCMDPASSWORD mcr.microsoft.com/mssql/server:2017-latest
26+
cd ../..
27+
go test -v ./...

‎.gitignore‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
# Binaries for programs and plugins
2-
output
3-
*.exe
4-
*.exe~
5-
*.dll
6-
*.so
7-
*.dylib
8-
9-
# Test binary, built with `go test -c`
10-
*.test
11-
12-
# Output of the go coverage tool, specifically when used with LiteIDE
13-
*.out
14-
15-
# Dependency directories (remove the comment below to include it)
16-
# vendor/
17-
18-
coverage.json
19-
coverage.txt
20-
coverage.xml
21-
testresults.xml
22-
23-
# .syso is generated by go-winres. Only needed for official builds
24-
*.syso
1+
# Binaries for programs and plugins
2+
output
3+
*.exe
4+
*.exe~
5+
*.dll
6+
*.so
7+
*.dylib
8+
9+
# Test binary, built with `go test -c`
10+
*.test
11+
12+
# Output of the go coverage tool, specifically when used with LiteIDE
13+
*.out
14+
15+
# Dependency directories (remove the comment below to include it)
16+
# vendor/
17+
18+
coverage.json
19+
coverage.txt
20+
coverage.xml
21+
testresults.xml
22+
23+
# .syso is generated by go-winres. Only needed for official builds
24+
*.syso

0 commit comments

Comments
 (0)