Skip to content

Commit

Permalink
Merge branch 'main' into renovate/cors-2.x-lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
wajeht authored Sep 7, 2023
2 parents 6a889db + 9f4d54f commit e273867
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
node-version: [19.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand All @@ -37,7 +37,7 @@ jobs:
node-version: [19.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand All @@ -63,7 +63,7 @@ jobs:
node-version: [19.x]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

steps:
- name: Check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
40 changes: 20 additions & 20 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"homepage": "https://github.com/wajeht/gains#readme",
"dependencies": {
"@formkit/auto-animate": "^0.7.0",
"@formkit/auto-animate": "^0.8.0",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-brands-svg-icons": "^6.2.0",
"@fortawesome/free-regular-svg-icons": "^6.2.0",
Expand Down Expand Up @@ -100,7 +100,7 @@
"knex": "^2.4.0",
"knex-paginate": "^3.0.1",
"lodash-es": "^4.17.21",
"marked": "^7.0.0",
"marked": "^8.0.0",
"minimist": "^1.2.6",
"multer": "^1.4.5-lts.1",
"node-cron": "^3.0.2",
Expand Down
11 changes: 10 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base"]
"extends": ["config:base"],
"packageRules": [
{
"matchUpdateTypes": ["minor", "patch"],
"matchCurrentVersion": "!/^0/",
"minimumReleaseAge": "3 days",
"automergeType": "branch",
"automerge": true
}
]
}

0 comments on commit e273867

Please sign in to comment.