Skip to content

Commit 2562943

Browse files
authored
Merge branch 'dev' into adding-transaction-timeout-option
2 parents 5cdb2eb + 6cc5a42 commit 2562943

File tree

7 files changed

+107
-110
lines changed

7 files changed

+107
-110
lines changed

.github/workflows/lint-github-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
19-
- uses: reviewdog/action-actionlint@95395aac8c053577d0bc67eb7b74936c660c6f66 # v1.67.0
19+
- uses: reviewdog/action-actionlint@f00ad0691526c10be4021a91b2510f0a769b14d0 # v1.68.0
2020
with:
2121
reporter: github-check
2222
fail_on_error: true
Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
name: changesets
1+
# NOTE: This filename must be called release.yml. If changed, update the Trusted Publisher settings in npm
2+
3+
name: Release
24

35
on:
46
push:
@@ -9,6 +11,9 @@ on:
911

1012
concurrency: ${{ github.workflow }}-${{ github.ref }}
1113

14+
permissions:
15+
id-token: write # Required for OIDC
16+
1217
jobs:
1318
release:
1419
name: Release
@@ -33,8 +38,12 @@ jobs:
3338
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3439
with:
3540
node-version: lts/*
41+
registry-url: https://registry.npmjs.org
3642
package-manager-cache: false
3743

44+
- name: Update npm # Need at least 11.5.1 for OIDC publishing
45+
run: npm install -g npm@latest
46+
3847
- name: Install Dependencies
3948
run: yarn
4049

@@ -43,15 +52,6 @@ jobs:
4352
git config --global user.name 'Neo4j Team GraphQL'
4453
git config --global user.email 'team-graphql@neotechnology.com'
4554
46-
- name: Creating .npmrc
47-
run: |
48-
cat << EOF > "$HOME/.npmrc"
49-
@neo4j:registry https://registry.npmjs.org
50-
//registry.npmjs.org/:_authToken=$NPM_TOKEN
51-
EOF
52-
env:
53-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
54-
5555
- name: Create release PR or release
5656
id: changesets
5757
uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba # v1.5.3
@@ -63,16 +63,13 @@ jobs:
6363
setupGitUser: false
6464
env:
6565
GITHUB_TOKEN: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
66-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
6766
YARN_ENABLE_IMMUTABLE_INSTALLS: false
6867
BRANCH: ${{ github.ref_name }}
6968

7069
slack-notify:
7170
needs:
7271
- release
73-
7472
if: ${{ needs.release.outputs.published == 'true' }}
75-
7673
runs-on: ubuntu-latest
7774
strategy:
7875
matrix:

.github/workflows/reusable-codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
node-version: lts/*
1616
package-manager-cache: false
1717
- name: Initialize CodeQL
18-
uses: github/codeql-action/init@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3
18+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4
1919
with:
2020
config-file: ./.github/codeql/codeql-config.yml
2121
languages: javascript
2222
- name: Perform CodeQL Analysis
23-
uses: github/codeql-action/analyze@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3
23+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
},
2626
"devDependencies": {
2727
"@tsconfig/node20": "20.1.6",
28-
"@typescript-eslint/eslint-plugin": "8.46.0",
29-
"@typescript-eslint/parser": "8.46.0",
28+
"@typescript-eslint/eslint-plugin": "8.46.1",
29+
"@typescript-eslint/parser": "8.46.1",
3030
"concurrently": "9.2.1",
3131
"dotenv": "17.2.3",
3232
"eslint": "8.57.1",
@@ -42,7 +42,7 @@
4242
"prettier": "3.6.2",
4343
"prettier-2": "npm:prettier@2.8.8",
4444
"set-tz": "0.2.0",
45-
"ts-jest": "29.4.4",
45+
"ts-jest": "29.4.5",
4646
"typescript": "5.9.3"
4747
},
4848
"packageManager": "yarn@4.10.3",

packages/graphql/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@types/is-uuid": "1.0.2",
4848
"@types/jest": "30.0.0",
4949
"@types/jsonwebtoken": "9.0.10",
50-
"@types/node": "22.18.9",
50+
"@types/node": "22.18.10",
5151
"@types/pluralize": "0.0.33",
5252
"@types/randomstring": "1.3.0",
5353
"@types/semver": "7.7.1",
@@ -69,7 +69,7 @@
6969
"randomstring": "1.3.1",
7070
"rimraf": "6.0.1",
7171
"supertest": "7.1.4",
72-
"ts-jest": "29.4.4",
72+
"ts-jest": "29.4.5",
7373
"ts-node": "10.9.2",
7474
"typescript": "5.9.3",
7575
"ws": "8.18.3"
@@ -81,7 +81,7 @@
8181
"@graphql-tools/resolvers-composition": "^7.0.0",
8282
"@graphql-tools/schema": "^10.0.0",
8383
"@graphql-tools/utils": "10.9.1",
84-
"@neo4j/cypher-builder": "2.8.0",
84+
"@neo4j/cypher-builder": "2.8.1",
8585
"camelcase": "^6.3.0",
8686
"debug": "^4.3.4",
8787
"dot-prop": "^6.0.1",

packages/introspector/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"devDependencies": {
3737
"@neo4j/graphql": "^7.0.0",
3838
"@types/jest": "30.0.0",
39-
"@types/node": "22.18.9",
39+
"@types/node": "22.18.10",
4040
"@types/pluralize": "0.0.33",
4141
"jest": "30.2.0",
42-
"ts-jest": "29.4.4",
42+
"ts-jest": "29.4.5",
4343
"typescript": "5.9.3"
4444
},
4545
"dependencies": {

0 commit comments

Comments
 (0)