Skip to content

Commit a20f4cc

Browse files
committed
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.
1 parent 9760acc commit a20f4cc

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.github/workflows/manual_build.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
inputs:
55
version:
6-
description: 'Version of engine to build e.g. "3.4.4", "3.5"'
6+
description: 'Version of engine to build e.g. "3.4.4", "3.5"'
77
required: true
88
type: string
99
release_name:
@@ -34,9 +34,12 @@ jobs:
3434
elif [ "$MINOR_VERSION" = "4.0" ] || [ "$MINOR_VERSION" = "4.1" ] || [ "$MINOR_VERSION" = "4.2" ] || [ "$MINOR_VERSION" = "4.3" ]
3535
then
3636
echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:6.0-jammy" >> $GITHUB_OUTPUT
37-
else
37+
elif [ "$MINOR_VERSION" = "4.4" ]
38+
then
3839
echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:8.0-jammy" >> $GITHUB_OUTPUT
39-
fi
40+
else
41+
echo "dotnet_version=mcr.microsoft.com/dotnet/sdk:9.0-noble" >> $GITHUB_OUTPUT
42+
fi
4043
get_tags:
4144
name: Get Tags
4245
runs-on: ubuntu-24.04
@@ -46,20 +49,20 @@ jobs:
4649
steps:
4750
- run: echo IMAGE_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
4851
- run: echo IMAGE_TAG=$(echo ${{ github.event.inputs.release_name != 'stable' && format('.{0}', github.event.inputs.release_name) || '' }}) >> $GITHUB_ENV
49-
- name: Set tags
52+
- name: Set tags
5053
run: |
5154
echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags.txt
5255
echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags.txt
53-
- name: Set latest tags
56+
- name: Set latest tags
5457
if: ${{inputs.set_latest}}
5558
run: |
5659
echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:latest" >> tags.txt
5760
echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:latest" >> tags.txt
58-
- name: Set Mono tags
61+
- name: Set Mono tags
5962
run: |
6063
echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags_mono.txt
6164
echo "${{ secrets.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}:mono-${{ github.event.inputs.version }}${{ env.IMAGE_TAG }}" >> tags_mono.txt
62-
- name: Set Mono latest tags
65+
- name: Set Mono latest tags
6366
if: ${{inputs.set_latest}}
6467
run: |
6568
echo "ghcr.io/${{ env.IMAGE_OWNER }}/${{ env.IMAGE_NAME }}:mono-latest" >> tags_mono.txt
@@ -89,14 +92,14 @@ jobs:
8992
echo EOF
9093
} >> "$GITHUB_ENV"
9194
- uses: actions/checkout@v3
92-
- name: Login to GitHub Container Registry
95+
- name: Login to GitHub Container Registry
9396
uses: docker/[email protected]
9497
with:
9598
registry: ghcr.io
9699
username: ${{ github.repository_owner }}
97100
password: ${{ secrets.GITHUB_TOKEN }}
98101
- name: Login to DockerHub
99-
uses: docker/login-action@v1
102+
uses: docker/login-action@v1
100103
with:
101104
username: ${{ secrets.DOCKERHUB_USERNAME }}
102105
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -128,14 +131,14 @@ jobs:
128131
echo EOF
129132
} >> "$GITHUB_ENV"
130133
- uses: actions/checkout@v3
131-
- name: Login to GitHub Container Registry
134+
- name: Login to GitHub Container Registry
132135
uses: docker/[email protected]
133136
with:
134137
registry: ghcr.io
135138
username: ${{ github.repository_owner }}
136139
password: ${{ secrets.GITHUB_TOKEN }}
137140
- name: Login to DockerHub
138-
uses: docker/login-action@v1
141+
uses: docker/login-action@v1
139142
with:
140143
username: ${{ secrets.DOCKERHUB_USERNAME }}
141144
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -153,4 +156,3 @@ jobs:
153156
SUBDIR=${{ github.event.inputs.release_name != 'stable' && format('/{0}', github.event.inputs.release_name) || '' }}
154157
ZIP_GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless_64' || 'linux_x86_64' }}
155158
FILENAME_GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }}
156-

0 commit comments

Comments
 (0)