Skip to content

Commit

Permalink
Merge branch 'master' into feature/202312_code_smells
Browse files Browse the repository at this point in the history
  • Loading branch information
qdraw committed Dec 6, 2023
2 parents c48b428 + f63047c commit 3cd882b
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-swagger-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
npm run build
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v4

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
Expand All @@ -66,4 +66,4 @@ jobs:

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v3
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-codecov-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
ref: ${{ github.HEAD_REF }}

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-dotnetcore-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/starsky-sonarqube-clientapp-netcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
git fetch --prune --unshallow
- name: Setup .NET SDK
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.417

Expand Down
18 changes: 9 additions & 9 deletions starsky-tools/dropbox-import/package-lock.json

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

2 changes: 1 addition & 1 deletion starsky-tools/dropbox-import/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"update:install": "npx --yes npm-check-updates -u && npm install"
},
"dependencies": {
"axios": "^1.6.0",
"axios": "^1.6.2",
"dotenv": "^16.3.1"
},
"author": "",
Expand Down
14 changes: 7 additions & 7 deletions starsky-tools/thumbnail/package-lock.json

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

2 changes: 1 addition & 1 deletion starsky-tools/thumbnail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "ISC",
"dependencies": {
"@types/jpeg-autorotate": "^5.0.3",
"axios": "^1.6.0",
"axios": "^1.6.1",
"cwait": "^1.1.2",
"dotenv": "^16.3.1",
"jimp": "^0.22.10",
Expand Down
14 changes: 7 additions & 7 deletions starsky/starsky/clientapp/package-lock.json

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

2 changes: 1 addition & 1 deletion starsky/starsky/clientapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.2.2",
"vite": "^4.4.10"
"vite": "^4.5.1"
},
"jest": {
"testEnvironment": "jest-environment-jsdom",
Expand Down

0 comments on commit 3cd882b

Please sign in to comment.