diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index d91220d4..d7fa488f 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -375,15 +375,9 @@ jobs: - shell: pwsh run: | Get-ChildItem -Recurse - - shell: cmd - run: | - 7z x "OcarambaLite${{ env.frameworkVersion }}.zip" -o.\Ocaramba -y -bb0 - 7z x "OcarambaLiteS${{ env.frameworkVersion }}.zip" -o.\Ocaramba -y -bb0 - 7z x "OcarambaS${{ env.frameworkVersion }}.zip" -o.\Ocaramba -y -bb0 - 7z x "Ocaramba${{ env.frameworkVersion }}.zip" -o.\Ocaramba -y -bb0 - name: Push Nuget Package - run: dotnet push .\Ocaramba\Ocaramba.${{ env.frameworkVersion }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} + run: dotnet push .\Ocaramba.${{ env.frameworkVersion }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} if: (success() && startsWith(github.ref, 'refs/tags/')) - name: Push Nuget Package - run: dotnet push .\Ocaramba\OcarambaLite.${{ env.frameworkVersion }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} + run: dotnet push .\OcarambaLite.${{ env.frameworkVersion }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} if: (success() && startsWith(github.ref, 'refs/tags/')) diff --git a/Dockerfile b/Dockerfile index 3f062a97..6bfa5f3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 +FROM mcr.microsoft.com/dotnet/sdk:8.0 LABEL maintainer "Ocaramba " #========= # Midnight Commander, lbzip2 diff --git a/scripts/ExecutingTestsOnDockerGithubActions.ps1 b/scripts/ExecutingTestsOnDockerGithubActions.ps1 index 7dd3df89..ae86eebe 100644 --- a/scripts/ExecutingTestsOnDockerGithubActions.ps1 +++ b/scripts/ExecutingTestsOnDockerGithubActions.ps1 @@ -1,7 +1,8 @@ docker info docker ps -a -docker exec -u ocaramba ocaramba_selenium bash -c "ls ; sed -i '/Documentation/,+5 d' ./Ocaramba.sln ; dotnet build ./Ocaramba.sln" +docker exec -u root ocaramba_selenium bash -c "chmod -R 777 /Ocaramba" +docker exec -u ocaramba ocaramba_selenium bash -c "ls ; sed -i '/Documentation/,+5 d' ./Ocaramba.sln ; sed -i '/CloudProviderCrossBrowser/,+5 d' ./Ocaramba.sln; dotnet build ./Ocaramba.sln" docker exec -u ocaramba ocaramba_selenium bash -c 'pwsh ./scripts/set_AppConfig_for_tests.ps1 "./Ocaramba.Tests.NUnit/bin/Debug/net8.0" "appsettings.Linux.json" "appSettings" "browser|PathToChromeDriverDirectory" "Chrome|/usr/local/bin/" -logValues -json' docker exec -u ocaramba ocaramba_selenium bash -c 'dotnet vstest ./Ocaramba.Tests.NUnit/bin/Debug/net8.0/Ocaramba.Tests.NUnit.dll /TestCaseFilter:"(TestCategory!=NotImplementedInCoreOrUploadDownload)" /Parallel --logger:trx;LogFileName=Ocaramba.Tests.Docker.trx' docker exec -u ocaramba ocaramba_selenium bash -c "ls /Ocaramba/TestResults/ ; cp /Ocaramba/TestResults/*.trx /tmp/Ocaramba.Tests.Docker.trx"