Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
maxisoft committed May 4, 2024
2 parents 45831a7 + f9d82b3 commit 2f0666a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-asf-reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
excludes: draft,prerelease

- name: Import GPG key for signing
uses: crazy-max/ghaction-import-gpg@v6.0.0
uses: crazy-max/ghaction-import-gpg@v6.1.0
if: ${{ env.GPG_PRIVATE_KEY != null }}
with:
gpg_private_key: ${{ env.GPG_PRIVATE_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
submodules: recursive

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}

- name: Verify .NET Core
run: dotnet --info

- name: Build ${{ matrix.configuration }}
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 10
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
submodules: recursive

- name: Setup .NET Core
uses: actions/setup-dotnet@v3.0.3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}

Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Upload generic
continue-on-error: true
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.3
with:
name: ${{ matrix.os }}_${{ env.PLUGIN_NAME }}-generic
path: out/${{ env.PLUGIN_NAME }}-generic.zip
Expand All @@ -178,7 +178,7 @@ jobs:
# However, that is currently impossible due to https://github.com/dotnet/msbuild/issues/3897
# Therefore, we'll (sadly) pull artifacts from Windows machine only for now
- name: Download generic artifact from windows-latest
uses: actions/download-artifact@v3.0.2
uses: actions/download-artifact@v4.1.7
with:
name: windows-latest_${{ env.PLUGIN_NAME }}-generic
path: out
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ jobs:

- name: Setup .NET Core
timeout-minutes: 5
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}

- name: Verify .NET Core
run: dotnet --info

- name: Build ${{ matrix.configuration }}
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 10
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Upload stdout
continue-on-error: true
if: always()
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.3
with:
name: ${{ matrix.configuration }}_${{ matrix.asf_docker_tag }}_stdout
path: out.txt
Expand Down

0 comments on commit 2f0666a

Please sign in to comment.