From a20f4cc32a13854fa93f428ea5ed14029b7cb216 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 24 Sep 2025 17:25:18 +0200 Subject: [PATCH] Fix Mono Docker image still using .NET 8.0 and Ubuntu 22.04 It should now use .NET 9.0 and Ubuntu 22.04 like the standard Docker image. --- .github/workflows/manual_build.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/manual_build.yml b/.github/workflows/manual_build.yml index 505e82d..1dc4455 100644 --- a/.github/workflows/manual_build.yml +++ b/.github/workflows/manual_build.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: 'Version of engine to build e.g. "3.4.4", "3.5"' + description: 'Version of engine to build e.g. "3.4.4", "3.5"' required: true type: string release_name: @@ -34,9 +34,12 @@ jobs: elif [ "$MINOR_VERSION" = "4.0" ] || [ "$MINOR_VERSION" = "4.1" ] || [ "$MINOR_VERSION" = "4.2" ] || [ "$MINOR_VERSION" = "4.3" ] then echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:6.0-jammy" >> $GITHUB_OUTPUT - else + elif [ "$MINOR_VERSION" = "4.4" ] + then echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:8.0-jammy" >> $GITHUB_OUTPUT - fi + else + echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:9.0-noble" >> $GITHUB_OUTPUT + fi get_tags: name: Get Tags runs-on: ubuntu-24.04 @@ -46,20 +49,20 @@ jobs: steps: - run: echo IMAGE_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - run: echo IMAGE_TAG=$(echo ${{ github.event.inputs.release_name != 'stable' && format('.{0}', github.event.inputs.release_name) || '' }}) >> $GITHUB_ENV - - name: Set tags + - name: Set tags run: | echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags.txt echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags.txt - - name: Set latest tags + - name: Set latest tags if: ${{inputs.set_latest}} run: | echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:latest" >> tags.txt echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest" >> tags.txt - - name: Set Mono tags + - name: Set Mono tags run: | echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags_mono.txt echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags_mono.txt - - name: Set Mono latest tags + - name: Set Mono latest tags if: ${{inputs.set_latest}} run: | echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-latest" >> tags_mono.txt @@ -89,14 +92,14 @@ jobs: echo EOF } >> "$GITHUB_ENV" - uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to GitHub Container Registry uses: docker/login-action@v1.14.1 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -128,14 +131,14 @@ jobs: echo EOF } >> "$GITHUB_ENV" - uses: actions/checkout@v3 - - name: Login to GitHub Container Registry + - name: Login to GitHub Container Registry uses: docker/login-action@v1.14.1 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -153,4 +156,3 @@ jobs: SUBDIR=${{ github.event.inputs.release_name != 'stable' && format('/{0}', github.event.inputs.release_name) || '' }} ZIP_GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless_64' || 'linux_x86_64' }} FILENAME_GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }} -