Skip to content

Commit

Permalink
Merge branch 'main' into WikiRik/snowflake-types-update
Browse files Browse the repository at this point in the history
  • Loading branch information
sdepold committed May 17, 2024
2 parents d784f6d + f58b8b8 commit 003be90
Show file tree
Hide file tree
Showing 10 changed files with 682 additions and 799 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
if: github.repository == 'sequelize/sequelize'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
fetch-depth: '0' # This is required to actually get all the authors
persist-credentials: false
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Upload install and build artifact (Node ${{ matrix.node-version }})
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -46,7 +46,7 @@ jobs:
runs-on: ubuntu-latest
needs: install-and-build
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20.x
Expand All @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
needs: lint
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
runs-on: windows-latest
needs: lint # don't bother running if lint tests fail
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -139,7 +139,7 @@ jobs:
runs-on: ubuntu-latest
needs: lint
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20.x
Expand All @@ -159,7 +159,7 @@ jobs:
runs-on: ubuntu-latest
needs: lint
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20.x
Expand All @@ -184,7 +184,7 @@ jobs:
env:
DIALECT: sqlite3
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -211,7 +211,7 @@ jobs:
DIALECT: ${{ matrix.native && 'postgres-native' || 'postgres' }}
SEQ_PG_MINIFY_ALIASES: ${{ matrix.minify-aliases && '1' || '' }}
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
env:
DIALECT: ${{ matrix.dialect }}
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -267,7 +267,7 @@ jobs:
with:
app-id: '${{ secrets.SEQUELIZE_BOT_APP_ID }}'
private-key: '${{ secrets.SEQUELIZE_BOT_PRIVATE_KEY }}'
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
with:
# Number of commits to fetch. 0 indicates all history for all branches and tags.
# We need the entire history to generate the changelog properly
Expand Down
508 changes: 254 additions & 254 deletions .yarn/releases/yarn-4.2.1.cjs → .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.1.cjs
yarnPath: .yarn/releases/yarn-4.2.2.cjs
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
"@types/chai": "4.3.16",
"@types/lodash": "4.17.1",
"@types/mocha": "10.0.6",
"@types/node": "20.12.8",
"@types/node": "20.12.12",
"chai": "4.4.1",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"esbuild": "0.17.19",
"eslint": "8.57.0",
"eslint-plugin-jsdoc": "48.2.3",
"eslint-plugin-jsdoc": "48.2.5",
"eslint-plugin-mocha": "10.4.3",
"fast-glob": "3.3.2",
"husky": "9.0.11",
Expand All @@ -90,18 +90,18 @@
"mocha": "10.4.0",
"node-gyp": "10.1.0",
"node-hook": "1.0.0",
"nx": "18.3.4",
"nx": "18.3.5",
"prettier": "3.2.5",
"prettier-plugin-organize-imports": "3.2.4",
"source-map-support": "0.5.21",
"ts-node": "10.9.2",
"typedoc": "0.25.13",
"typedoc-plugin-carbon-ads": "1.6.0",
"typedoc-plugin-mdn-links": "3.1.24",
"typedoc-plugin-mdn-links": "3.1.25",
"typedoc-plugin-missing-exports": "2.2.0",
"typescript": "5.4.5"
},
"packageManager": "yarn@4.2.1",
"packageManager": "yarn@4.2.2",
"lint-staged": {
"*.{js,mjs,cjs,ts,mts,cts}": "eslint --fix --report-unused-disable-directives",
"*": "prettier --write --ignore-unknown"
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
},
"description": "The Sequelize CLI\nDocumentation: https://sequelize.org/docs/v7/cli/",
"devDependencies": {
"@oclif/test": "3.2.13",
"@oclif/test": "3.2.15",
"@types/chai": "4.3.16",
"@types/mocha": "10.0.6",
"chai": "4.4.1",
"concurrently": "8.2.2",
"mocha": "10.4.0",
"oclif": "4.10.3",
"rimraf": "5.0.5"
"oclif": "4.10.11",
"rimraf": "5.0.7"
},
"engines": {
"node": ">=18.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@types/sinon-chai": "3.2.12",
"@types/uuid": "9.0.8",
"chai": "4.4.1",
"chai-as-promised": "7.1.1",
"chai-as-promised": "7.1.2",
"chai-datetime": "1.8.0",
"delay": "5.0.0",
"expect-type": "0.13.0",
Expand All @@ -91,8 +91,8 @@
"p-props": "4.0.0",
"p-settle": "4.1.1",
"p-timeout": "4.1.0",
"rimraf": "5.0.5",
"sinon": "17.0.1",
"rimraf": "5.0.7",
"sinon": "17.0.2",
"sinon-chai": "3.7.0"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/mssql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
"@types/sinon": "17.0.3",
"chai": "4.4.1",
"mocha": "10.4.0",
"sinon": "17.0.1"
"sinon": "17.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/validator-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@types/chai": "4.3.16",
"@types/chai-as-promised": "7.1.8",
"chai": "4.4.1",
"chai-as-promised": "7.1.1",
"chai-as-promised": "7.1.2",
"mocha": "10.4.0"
}
}
Loading

0 comments on commit 003be90

Please sign in to comment.