Skip to content

Commit

Permalink
Merge pull request #49 from etherisc/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
doerfli authored Jan 22, 2024
2 parents dbf599d + fe5d9df commit 1069ca3
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java
Expand All @@ -55,4 +55,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/combineprs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
id: create-combined-pr
name: Create Combined PR
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
104 changes: 52 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"devDependencies": {
"@etherisc/registry-contracts": "1.1.2-6e0b482",
"@typechain/ethers-v5": "^11.1.2",
"@types/node": "^18.18.7",
"@types/node": "^18.19.8",
"ts-node-dev": "^2.0.0",
"typechain": "^8.3.2",
"typescript": "^5.2.2"
"typescript": "^5.3.3"
},
"dependencies": {
"@types/express": "^4.17.20",
"dotenv": "^16.3.1",
"dotenv": "^16.3.2",
"ethers": "^5.7.2",
"express": "^4.18.2",
"redis": "^4.6.10",
"redis": "^4.6.12",
"redis-om": "^0.4.2",
"winston": "^3.11.0"
}
Expand Down

0 comments on commit 1069ca3

Please sign in to comment.