Skip to content

Commit 5553539

Browse files
author
David Courtey
committed
merge: resolve composer.lock conflict with main
2 parents 0051852 + 8d31d61 commit 5553539

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

.github/workflows/docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323

2424
- name: Check for base image changes
25-
uses: dorny/paths-filter@v3
25+
uses: dorny/paths-filter@v4
2626
id: filter
2727
with:
2828
filters: |
@@ -37,15 +37,15 @@ jobs:
3737

3838
- name: Set up QEMU
3939
if: steps.filter.outputs.base == 'true'
40-
uses: docker/setup-qemu-action@v3
40+
uses: docker/setup-qemu-action@v4
4141

4242
- name: Set up Docker Buildx
4343
if: steps.filter.outputs.base == 'true'
44-
uses: docker/setup-buildx-action@v3
44+
uses: docker/setup-buildx-action@v4
4545

4646
- name: Login to Docker Hub
4747
if: steps.filter.outputs.base == 'true'
48-
uses: docker/login-action@v3
48+
uses: docker/login-action@v4
4949
with:
5050
username: ${{ vars.DOCKERHUB_USERNAME }}
5151
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -81,13 +81,13 @@ jobs:
8181
- uses: actions/checkout@v4
8282

8383
- name: Set up QEMU
84-
uses: docker/setup-qemu-action@v3
84+
uses: docker/setup-qemu-action@v4
8585

8686
- name: Set up Docker Buildx
87-
uses: docker/setup-buildx-action@v3
87+
uses: docker/setup-buildx-action@v4
8888

8989
- name: Login to Docker Hub
90-
uses: docker/login-action@v3
90+
uses: docker/login-action@v4
9191
with:
9292
username: ${{ vars.DOCKERHUB_USERNAME }}
9393
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
3030

3131
- name: Setup Node.js
32-
uses: actions/setup-node@v4
32+
uses: actions/setup-node@v6
3333
with:
3434
node-version: 20
3535
cache: 'npm'

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
sudo apt-get install -y mongodb-database-tools
9898
9999
- name: Setup Node
100-
uses: actions/setup-node@v4
100+
uses: actions/setup-node@v6
101101
with:
102102
node-version: '22'
103103
cache: 'npm'

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"codeat3/blade-devicons": "^1.8",
1818
"davidhsianturi/blade-bootstrap-icons": "^2.2",
1919
"dedoc/scramble": "^0.13.8",
20-
"kovah/laravel-socialite-oidc": "^0.7.0",
20+
"kovah/laravel-socialite-oidc": "^0.8.0",
2121
"laravel-notification-channels/discord": "^1.7",
2222
"laravel-notification-channels/pushover": "^5.0",
2323
"laravel-notification-channels/telegram": "^7.0",
2424
"laravel/fortify": "^1.30",
2525
"laravel/framework": "^13.0",
26-
"laravel/mcp": "^0.6.2",
26+
"laravel/mcp": "^0.7.0",
2727
"laravel/sanctum": "^4.2",
2828
"laravel/slack-notification-channel": "^3.7",
2929
"laravel/socialite": "^5.24",

composer.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)