diff --git a/.github/workflows/githubactionsbuilds.yml b/.github/workflows/githubactionsbuilds.yml index 86006c7..4e70704 100644 --- a/.github/workflows/githubactionsbuilds.yml +++ b/.github/workflows/githubactionsbuilds.yml @@ -160,9 +160,9 @@ jobs: name: DeveMazeGeneratorCore.ConsoleApp.Linux path: BuildOutputConsole/* - build_windows_consoleapp: + build_linux_consoleapp_onlinux: needs: generate_version_number - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Setup .NET Core @@ -187,9 +187,10 @@ jobs: name: DeveMazeGeneratorCore.ConsoleApp.Windows path: BuildOutputConsole/*.exe - build_windows: + + build_linux_with_sonarqube: needs: generate_version_number - runs-on: windows-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Setup .NET Core @@ -221,7 +222,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: dotnet-sonarscanner end /d:sonar.login=${{secrets.SONARQUBETOKEN}} - name: Pack - run: dotnet pack DeveMazeGeneratorCore\DeveMazeGeneratorCore.csproj --verbosity normal --no-build -c Release /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}} + run: dotnet pack DeveMazeGeneratorCore/DeveMazeGeneratorCore.csproj --verbosity normal --no-build -c Release /p:Version=1.0.${{needs.generate_version_number.outputs.build_number}} - name: Run CodeCov uses: codecov/codecov-action@v4 with: @@ -231,9 +232,24 @@ jobs: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Run GoPackage.ps1 script - run: .\Scripts\GoPackage.ps1 - shell: pwsh + - name: Package DeveMazeGeneratorCore + run: | + # Create output directory + mkdir -p Scripts/Output + + # Remove existing files if they exist + rm -f Scripts/Output/DeveMazeGeneratorCore.7z + rm -f Scripts/Output/DeveMazeGeneratorCore.zip + + # Package the build output + cd DeveMazeGeneratorCore/bin/Release + + # Create zip file (excluding .pdb files) + zip -r ../../../Scripts/Output/DeveMazeGeneratorCore.zip . -x "*.pdb" + + # Create 7z file (excluding .pdb files) + 7z a -t7z -m0=LZMA2 -mmt=on -mx9 -md=1536m -mfb=273 -ms=on -mqs=on -sccUTF-8 "../../../Scripts/Output/DeveMazeGeneratorCore.7z" . -x!"*.pdb" + shell: bash - uses: actions/upload-artifact@v4 @@ -483,9 +499,9 @@ jobs: release_github: needs: [ generate_version_number, - build_windows_consoleapp, build_linux_consoleapp, - build_windows, + build_linux_consoleapp_onlinux, + build_linux_with_sonarqube, build_linux, build_docker, build_linux_monogame_desktopgl, @@ -546,7 +562,7 @@ jobs: release_nuget: - needs: [generate_version_number, build_windows, build_linux, build_docker] + needs: [generate_version_number, build_linux_with_sonarqube, build_linux, build_docker] runs-on: ubuntu-latest if: github.ref == 'refs/heads/master' steps: