Skip to content

Commit

Permalink
fixed docker
Browse files Browse the repository at this point in the history
  • Loading branch information
jraczek-acc committed Jan 20, 2025
1 parent c23bf7e commit 9148139
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/'))
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:9.0
FROM mcr.microsoft.com/dotnet/sdk:8.0
LABEL maintainer "Ocaramba <[email protected]>"

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / test_Stage_RunTestsOnDocker

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/
#=========
# Midnight Commander, lbzip2
Expand Down
3 changes: 2 additions & 1 deletion scripts/ExecutingTestsOnDockerGithubActions.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 9148139

Please sign in to comment.