Skip to content

Commit 074c92a

Browse files
authored
Merge pull request #70 from xdev-software/develop
Release
2 parents a965b11 + f821c06 commit 074c92a

9 files changed

Lines changed: 25 additions & 21 deletions

.github/workflows/broken-links.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
link-checker:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- run: mv .github/.lycheeignore .lycheeignore
1818

1919
- name: Link Checker
2020
id: lychee
21-
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
21+
uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2
2222
with:
2323
fail: false # Don't fail on broken links, create an issue instead
2424

@@ -30,13 +30,13 @@ jobs:
3030
GH_TOKEN: ${{ github.token }}
3131

3232
- name: Close issue if everything is fine
33-
if: env.lychee_exit_code == 0 && steps.find-issue.outputs.number != ''
33+
if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
3434
run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
3535
env:
3636
GH_TOKEN: ${{ github.token }}
3737

3838
- name: Create Issue From File
39-
if: env.lychee_exit_code != 0
39+
if: steps.lychee.outputs.exit_code != 0
4040
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
4141
with:
4242
issue-number: ${{ steps.find-issue.outputs.number }}

.github/workflows/check-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
build:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525

2626
# Build entirely in docker
2727
- uses: docker/setup-qemu-action@v3

.github/workflows/image-vuln-scan.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
runs-on: ubuntu-latest
1818
continue-on-error: true # Ignore errors, we create an issue instead
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121

2222
- name: Scan - Full
23-
uses: aquasecurity/trivy-action@0.31.0
23+
uses: aquasecurity/trivy-action@0.33.0
2424
with:
2525
image-ref: ${{ env.TRIVYY_IMAGE_REF }}
2626

2727
- name: Scan - Relevant
2828
id: scan_relevant
29-
uses: aquasecurity/trivy-action@0.31.0
29+
uses: aquasecurity/trivy-action@0.33.0
3030
with:
3131
image-ref: ${{ env.TRIVYY_IMAGE_REF }}
3232
exit-code: 1

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
check-code:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
# Build entirely in docker
1818
- uses: docker/setup-qemu-action@v3
@@ -35,7 +35,7 @@ jobs:
3535
upload_url: ${{ steps.create-release.outputs.upload_url }}
3636
version: ${{ steps.version.outputs.release }}
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939

4040
- name: Configure Git
4141
run: |
@@ -90,7 +90,7 @@ jobs:
9090
attestations: write
9191
id-token: write
9292
steps:
93-
- uses: actions/checkout@v4
93+
- uses: actions/checkout@v5
9494

9595
- name: Init Git and pull
9696
run: |
@@ -149,7 +149,7 @@ jobs:
149149
runs-on: ubuntu-latest
150150
needs: [publish-docker]
151151
steps:
152-
- uses: actions/checkout@v4
152+
- uses: actions/checkout@v5
153153

154154
- name: Init Git and pull
155155
run: |
@@ -160,7 +160,7 @@ jobs:
160160
- name: Inc Version and SNAP
161161
run: |
162162
version=$(grep -oPm1 "(?<=<VersionPrefix>)[^<]+" <<< cat src/OpenIdConnectServerMock.csproj)
163-
new_version="$(echo $version | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{if(length($NF+1)>length($NF))$(NF-1)++; $NF=sprintf("%0*d", length($NF), ($NF+1)%(10^length($NF))); print}')-SNAPSHOT"
163+
new_version="$(echo $version | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{$NF=sprintf("%0*d", length($NF), ($NF+1)); print}')-SNAPSHOT"
164164
sed -i "s/\(<VersionPrefix>\)[^<>]*\(<\/VersionPrefix.*\)/\1$new_version\2/" src/OpenIdConnectServerMock.csproj
165165
166166
- name: Git Commit and Push

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
labels:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
sparse-checkout: .github/labels.yml
2121

.github/workflows/test-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
attestations: write
1313
id-token: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- uses: docker/setup-qemu-action@v3
1818

.github/workflows/update-from-template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }}
3636
create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }}
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939
with:
4040
# Required because otherwise there are always changes detected when executing diff/rev-list
4141
fetch-depth: 0
@@ -181,7 +181,7 @@ jobs:
181181
if: needs.update.outputs.create_update_branch_merged_pr == 1
182182
runs-on: ubuntu-latest
183183
steps:
184-
- uses: actions/checkout@v4
184+
- uses: actions/checkout@v5
185185
with:
186186
# Required because otherwise there are always changes detected when executing diff/rev-list
187187
fetch-depth: 0

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# 1.0.10
1+
# 1.1.1
2+
* Updated dependencies
3+
* Updated ``Duende.IdentityServer`` to ``7.3``
4+
5+
# 1.1.0
26
* Backported some cleanup commits from upstream
37
* Updated dependencies
48

src/OpenIdConnectServerMock.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Duende.IdentityServer" Version="7.2.4" />
30-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.17" />
31-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.17" />
29+
<PackageReference Include="Duende.IdentityServer" Version="7.3.1" />
30+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.19" />
31+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.19" />
3232
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
3333
<PackageReference Include="YamlDotNet" Version="16.3.0" />
3434
</ItemGroup>

0 commit comments

Comments
 (0)