Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/HicServices/RDMP into re…
Browse files Browse the repository at this point in the history
…lease/8.4.0
  • Loading branch information
JFriel committed Oct 30, 2024
2 parents 80b03e7 + 17f0569 commit 23cd4c1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
mv `find coverage -type f` db-ui.lcov
dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv `find coverage -type f` db-core.lcov
- uses: coverallsapp/[email protected].3
- uses: coverallsapp/[email protected].4
with:
github-token: ${{ secrets.github_token }}
files: ./db-ui.lcov ./db-core.lcov
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
mv `find coverage -type f` fs-ui.lcov
dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv `find coverage -type f` fs-core.lcov
- uses: coverallsapp/[email protected].3
- uses: coverallsapp/[email protected].4
with:
github-token: ${{ secrets.github_token }}
files: ./fs-ui.lcov ./fs-core.lcov
Expand All @@ -154,7 +154,7 @@ jobs:
shell: bash
run: perl -ne "print \"rdmpversion=\$1\n\" if /AssemblyInformationalVersion\(\"([0-9a-z.-]+)\"\)/;" SharedAssemblyInfo.cs >> $GITHUB_OUTPUT
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.0.1
uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 7.0.x
- name: BundleSource
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- name: Install Perl dependencies
uses: shogo82148/[email protected].3
uses: shogo82148/[email protected].4
with:
install-modules-with: cpanm
install-modules: Archive::Zip Archive::Tar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
submodules: true
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.0.1
uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 6.0.x
- name: Cache Nuget
Expand Down
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.2" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.38" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.38" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.38" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.6" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.42" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.42" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.42" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Equ" Version="2.3.0" />
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
Expand Down Expand Up @@ -40,7 +40,7 @@
<PackageVersion Include="NunitXml.TestLogger" Version="4.1.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
<PackageVersion Include="NSubstitute" Version="5.1.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
</ItemGroup>
Expand Down

0 comments on commit 23cd4c1

Please sign in to comment.