Skip to content

Commit

Permalink
Merge pull request #263 from HicServices/develop
Browse files Browse the repository at this point in the history
Merge Develop into Main
  • Loading branch information
JFriel committed Mar 11, 2024
2 parents 874e6c8 + afdaf11 commit 1c53092
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: develop
target-branch: main
schedule:
interval: daily
- package-ecosystem: nuget
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
target-branch: develop
target-branch: main
reviewers:
- jas88
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "main","develop" ]
branches: [ "main" ]
pull_request:
branches: [ "main","develop" ]
branches: [ "main" ]
schedule:
- cron: "11 4 * * 3"

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed Drop table to work correctly with Views
- Exists now works correctly for Views (previously it would return true if there was no view but a table with the same name)

[Unreleased]: https://github.com/HicServices/FAnsiSql/compare/v3.2.0...develop
[Unreleased]: https://github.com/HicServices/FAnsiSql/compare/v3.2.1...main
[3.2.1]: https://github.com/HicServices/FAnsiSql/compare/v3.2.0...v3.2.1
[3.2.0]: https://github.com/HicServices/FAnsiSql/compare/v3.1.1...v3.2.0
[3.1.1]: https://github.com/HicServices/FAnsiSql/compare/v3.1.0...v3.1.1
[3.1.0]: https://github.com/HicServices/FAnsiSql/compare/3.0.1...v3.1.0
Expand Down

0 comments on commit 1c53092

Please sign in to comment.