Skip to content

Commit

Permalink
Merge branch 'develop' into feature/library_import
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/cd_standard.yaml
  • Loading branch information
jmmorato committed Dec 6, 2023
2 parents d216df6 + 8be08f4 commit 710384b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd_standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -524,11 +524,11 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'

Expand Down Expand Up @@ -620,7 +620,7 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci_standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
fetch-depth: 0

# - name: Setup dotnet 8.0
# uses: actions/setup-dotnet@v3
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: '8.0.x'
#
# - name: Setup dotnet 6.0
# uses: actions/setup-dotnet@v3
# uses: actions/setup-dotnet@v4
# with:
# dotnet-version: '6.0.x'

Expand Down Expand Up @@ -133,12 +133,12 @@ jobs:
fetch-depth: 0

- name: Setup dotnet 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Setup dotnet 8.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'

Expand Down Expand Up @@ -260,12 +260,12 @@ jobs:
fetch-depth: 0

- name: Setup dotnet 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

- name: Setup dotnet 8.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'

Expand Down

0 comments on commit 710384b

Please sign in to comment.