Skip to content

Commit

Permalink
Merge test changes to main (#311)
Browse files Browse the repository at this point in the history
Automatically created pull-request in order to merge changes that were
recently pushed to the test branch, back to main
  • Loading branch information
hwinther authored Oct 10, 2024
2 parents 06b82f8 + f524445 commit 3714833
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 35 deletions.
6 changes: 3 additions & 3 deletions .github/actions/backend-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:
# creds: ${{ env.AZURE_CREDENTIALS }}

- name: "Docker Login"
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
login-server: ${{ env.DOCKER_REGISTRY_SERVER }}
username: ${{ env.DOCKER_REGISTRY_USERNAME }}
Expand All @@ -55,7 +55,7 @@ runs:
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- uses: actions/cache@v3
- uses: actions/cache@v4
if: ${{ !inputs.skip_setup }}
id: nuget-cache
with:
Expand Down Expand Up @@ -96,7 +96,7 @@ runs:
images: ${{ env.DOCKER_REGISTRY_SERVER }}/${{ inputs.docker_image_name }}:${{ env.INFORMATIONAL_VERSION }}

- name: "Create or update deploy results PR comment"
uses: im-open/update-pr-comment@v1.1.3
uses: im-open/update-pr-comment@v1.2.2
if: ${{ github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
with:
github-token: ${{ env.GH_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/frontend-deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
using: "composite"
steps:
- name: "Docker Login"
uses: azure/docker-login@v1
uses: azure/docker-login@v2
with:
login-server: ${{ env.DOCKER_REGISTRY_SERVER }}
username: ${{ env.DOCKER_REGISTRY_USERNAME }}
Expand All @@ -32,7 +32,7 @@ runs:
docker push ${{ env.DOCKER_REGISTRY_SERVER }}/${{ inputs.docker_image_name }}:latest
- name: "Create or update deploy results PR comment"
uses: im-open/update-pr-comment@v1.1.3
uses: im-open/update-pr-comment@v1.2.2
if: ${{ github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' }}
with:
github-token: ${{ env.GH_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
uses: actions/checkout@v4

- name: Get version
uses: reecetech/version-increment@2024.4.4
uses: reecetech/version-increment@2024.9.2
id: version
with:
scheme: semver
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/promotion-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Create Pull Request
id: create-pr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
if: ${{ steps.check.outputs.skip == 'false' && steps.check.outputs.has_diff == 'true' }}
with:
token: ${{ secrets.WORKFLOW_TOKEN }}
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Create Pull Request
id: create-pr
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
if: ${{ steps.check.outputs.skip == 'false' && steps.check.outputs.has_diff == 'true' }}
with:
token: ${{ secrets.WORKFLOW_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fetch-depth: 0 # used by GitVersion to find the most recent tag outside of this branch

- name: Get version
uses: reecetech/version-increment@2024.4.4
uses: reecetech/version-increment@2024.9.2
id: version
with:
scheme: semver
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fi
- name: Get next version
uses: reecetech/version-increment@2024.4.4
uses: reecetech/version-increment@2024.9.2
id: version
if: ${{ steps.check-changes.outputs.has_diff == 'true' }}
with:
Expand Down
9 changes: 4 additions & 5 deletions src/frontend/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 src/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"openapi-types": "^12.1.3",
"orval": "^7.1.0",
"prettier": "^3.3.2",
"typescript": "^5.2.2",
"typescript": "^5.6.3",
"typescript-eslint": "^8.8.1",
"vite": "^5.4.7",
"vite-plugin-mkcert": "^1.17.5",
Expand Down
33 changes: 16 additions & 17 deletions tests/playwright/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 tests/playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"@cspell/eslint-plugin": "^8.9.1",
"@eslint/js": "8.57.0",
"@playwright/test": "^1.47.1",
"@playwright/test": "^1.48.0",
"@types/node": "^22.7.5",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.2.0",
Expand All @@ -36,7 +36,7 @@
"eslint-ts-patch": "^8.57.0-0",
"globals": "^15.11.0",
"prettier": "^3.2.5",
"typescript": "^5.4.5",
"typescript": "^5.6.3",
"typescript-eslint": "^7.8.0"
}
}

0 comments on commit 3714833

Please sign in to comment.