Bump to Ubuntu 24.04, .NET 9.0, Godot 4.5, remove rcedit as it's not needed anymore (#184)

This commit is contained in:
laraproto
2025-09-18 17:37:34 +03:00
committed by GitHub
parent e1b7d54a34
commit 9760acc92f
6 changed files with 18 additions and 29 deletions

View File

@@ -8,7 +8,7 @@ on:
jobs: jobs:
fetch: fetch:
name: Fetch Latest Godot Engine Release name: Fetch Latest Godot Engine Release
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
outputs: outputs:
release_tag: ${{ steps.parse.outputs.tag }} release_tag: ${{ steps.parse.outputs.tag }}
steps: steps:
@@ -20,7 +20,7 @@ jobs:
echo "tag=$TAG" >> $GITHUB_OUTPUT echo "tag=$TAG" >> $GITHUB_OUTPUT
current: current:
name: Fetch Current Godot CI release name: Fetch Current Godot CI release
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
outputs: outputs:
release_tag: ${{ steps.parse.outputs.tag }} release_tag: ${{ steps.parse.outputs.tag }}
steps: steps:
@@ -32,7 +32,7 @@ jobs:
create: create:
needs: [fetch, current] needs: [fetch, current]
name: Create New Godot CI Release name: Create New Godot CI Release
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
if: needs.fetch.outputs.release_tag != needs.current.outputs.release_tag if: needs.fetch.outputs.release_tag != needs.current.outputs.release_tag
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@@ -11,7 +11,7 @@ env:
jobs: jobs:
export-windows: export-windows:
name: Windows Export name: Windows Export
runs-on: ubuntu-22.04 # Use 22.04 with godot 4 runs-on: ubuntu-24.04 # Use 24.04 with godot 4
container: container:
image: barichello/godot-ci:4.3 image: barichello/godot-ci:4.3
steps: steps:
@@ -39,7 +39,7 @@ jobs:
export-linux: export-linux:
name: Linux Export name: Linux Export
runs-on: ubuntu-22.04 # Use 22.04 with godot 4 runs-on: ubuntu-24.04 # Use 24.04 with godot 4
container: container:
image: barichello/godot-ci:4.3 image: barichello/godot-ci:4.3
steps: steps:
@@ -65,7 +65,7 @@ jobs:
export-web: export-web:
name: Web Export name: Web Export
runs-on: ubuntu-22.04 # Use 22.04 with godot 4 runs-on: ubuntu-24.04 # Use 24.04 with godot 4
container: container:
image: barichello/godot-ci:4.3 image: barichello/godot-ci:4.3
steps: steps:
@@ -99,7 +99,7 @@ jobs:
export-mac: export-mac:
name: Mac Export name: Mac Export
runs-on: ubuntu-22.04 # Use 22.04 with godot 4 runs-on: ubuntu-24.04 # Use 24.04 with godot 4
container: container:
image: barichello/godot-ci:4.3 image: barichello/godot-ci:4.3
steps: steps:

View File

@@ -20,7 +20,7 @@ env:
jobs: jobs:
version: version:
name: Get Version name: Get Version
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
outputs: outputs:
dotnet_version: ${{ steps.calculate.outputs.dotnet_version }} dotnet_version: ${{ steps.calculate.outputs.dotnet_version }}
steps: steps:
@@ -39,7 +39,7 @@ jobs:
fi fi
get_tags: get_tags:
name: Get Tags name: Get Tags
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
outputs: outputs:
tags: ${{steps.write_tags.outputs.tags}} tags: ${{steps.write_tags.outputs.tags}}
tags_mono: ${{steps.write_tags_mono.outputs.tags}} tags_mono: ${{steps.write_tags_mono.outputs.tags}}
@@ -76,7 +76,7 @@ jobs:
retention-days: 1 retention-days: 1
build: build:
name: Build Image name: Build Image
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
needs: get_tags needs: get_tags
steps: steps:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
@@ -115,7 +115,7 @@ jobs:
GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }} GODOT_PLATFORM=${{ startsWith( github.event.inputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }}
build-mono: build-mono:
name: Build Mono Image name: Build Mono Image
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
needs: [version, get_tags] needs: [version, get_tags]
steps: steps:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4

View File

@@ -7,7 +7,7 @@ env:
jobs: jobs:
version: version:
name: Get Version name: Get Version
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
outputs: outputs:
version: ${{ steps.calculate.outputs.version }} version: ${{ steps.calculate.outputs.version }}
release_name: ${{ steps.calculate.outputs.release_name }} release_name: ${{ steps.calculate.outputs.release_name }}
@@ -32,7 +32,7 @@ jobs:
build: build:
name: Build Image name: Build Image
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
needs: [version] needs: [version]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
@@ -66,7 +66,7 @@ jobs:
GODOT_PLATFORM=${{ startsWith( needs.version.outputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }} GODOT_PLATFORM=${{ startsWith( needs.version.outputs.version, '3.' ) && 'linux_headless.64' || 'linux.x86_64' }}
build-mono: build-mono:
name: Build Mono Image name: Build Mono Image
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
needs: [version] needs: [version]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@@ -1,4 +1,4 @@
FROM ubuntu:jammy FROM ubuntu:noble
LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors" LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors"
USER root USER root
@@ -14,12 +14,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
adb \ adb \
openjdk-17-jdk-headless \ openjdk-17-jdk-headless \
rsync \ rsync \
wine64 \
osslsigncode \ osslsigncode \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# When in doubt, see the downloads page: https://github.com/godotengine/godot-builds/releases/ # When in doubt, see the downloads page: https://github.com/godotengine/godot-builds/releases/
ARG GODOT_VERSION="4.4" ARG GODOT_VERSION="4.5"
# Example values: stable, beta3, rc1, dev2, etc. # Example values: stable, beta3, rc1, dev2, etc.
# Also change the `SUBDIR` argument below when NOT using stable. # Also change the `SUBDIR` argument below when NOT using stable.
@@ -80,7 +79,3 @@ RUN echo 'export/android/force_system_user = false' >> ~/.config/godot/editor_se
RUN echo 'export/android/timestamping_authority_url = ""' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres RUN echo 'export/android/timestamping_authority_url = ""' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
RUN echo 'export/android/shutdown_adb_on_exit = true' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres RUN echo 'export/android/shutdown_adb_on_exit = true' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
# Download and set up rcedit to change Windows executable icons on export.
RUN wget https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe -O /opt/rcedit.exe
RUN echo 'export/windows/rcedit = "/opt/rcedit.exe"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
RUN echo 'export/windows/wine = "/usr/bin/wine64-stable"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres

View File

@@ -1,4 +1,4 @@
ARG IMAGE="mcr.microsoft.com/dotnet/sdk:8.0-jammy" ARG IMAGE="mcr.microsoft.com/dotnet/sdk:9.0-noble"
FROM $IMAGE FROM $IMAGE
LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors" LABEL author="https://github.com/aBARICHELLO/godot-ci/graphs/contributors"
@@ -15,12 +15,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
openjdk-17-jdk-headless \ openjdk-17-jdk-headless \
adb \ adb \
rsync \ rsync \
wine64 \
osslsigncode \ osslsigncode \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# When in doubt, see the downloads page: https://github.com/godotengine/godot-builds/releases/ # When in doubt, see the downloads page: https://github.com/godotengine/godot-builds/releases/
ARG GODOT_VERSION="4.4" ARG GODOT_VERSION="4.5"
# Example values: stable, beta3, rc1, dev2, etc. # Example values: stable, beta3, rc1, dev2, etc.
# Also change the `SUBDIR` argument below when NOT using stable. # Also change the `SUBDIR` argument below when NOT using stable.
@@ -85,8 +84,3 @@ RUN echo 'export/android/debug_keystore_pass = "android"' >> ~/.config/godot/edi
RUN echo 'export/android/force_system_user = false' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres RUN echo 'export/android/force_system_user = false' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
RUN echo 'export/android/timestamping_authority_url = ""' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres RUN echo 'export/android/timestamping_authority_url = ""' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
RUN echo 'export/android/shutdown_adb_on_exit = true' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres RUN echo 'export/android/shutdown_adb_on_exit = true' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
# Download and set up rcedit to change Windows executable icons on export.
RUN wget https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe -O /opt/rcedit.exe
RUN echo 'export/windows/rcedit = "/opt/rcedit.exe"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres
RUN echo 'export/windows/wine = "/usr/bin/wine64-stable"' >> ~/.config/godot/editor_settings-${GODOT_VERSION:0:3}.tres