mirror of https://github.com/WerWolv/ImHex
build: Remove EoL Ubuntu 24.10 builds, Update AppImage runner to use 25.04
This commit is contained in:
parent
ca0b232ada
commit
48f4410a2a
|
|
@ -672,7 +672,6 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- release_num: "24.04"
|
- release_num: "24.04"
|
||||||
- release_num: "24.10"
|
|
||||||
- release_num: "25.04"
|
- release_num: "25.04"
|
||||||
|
|
||||||
name: 🐧 Ubuntu ${{ matrix.release_num }}
|
name: 🐧 Ubuntu ${{ matrix.release_num }}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:24.10 as build
|
FROM ubuntu:25.04 as build
|
||||||
|
|
||||||
# Used to invalidate layer cache but not mount cache
|
# Used to invalidate layer cache but not mount cache
|
||||||
# See https://github.com/moby/moby/issues/41715#issuecomment-733976493
|
# See https://github.com/moby/moby/issues/41715#issuecomment-733976493
|
||||||
|
|
|
||||||
|
|
@ -127,8 +127,6 @@ std::string_view getUpdateArtifactEnding() {
|
||||||
} else if (hex::executeCommand("grep -q 'ID=ubuntu' /etc/os-release") == 0) {
|
} else if (hex::executeCommand("grep -q 'ID=ubuntu' /etc/os-release") == 0) {
|
||||||
if (hex::executeCommand("grep 'VERSION_ID=\"24.04\"' /etc/os-release") == 0)
|
if (hex::executeCommand("grep 'VERSION_ID=\"24.04\"' /etc/os-release") == 0)
|
||||||
return ARCH_DEPENDENT("Ubuntu-24.04-x86_64.deb", "");
|
return ARCH_DEPENDENT("Ubuntu-24.04-x86_64.deb", "");
|
||||||
else if (hex::executeCommand("grep -q 'VERSION_ID=\"24.10\"' /etc/os-release") == 0)
|
|
||||||
return ARCH_DEPENDENT("Ubuntu-24.10-x86_64.deb", "");
|
|
||||||
else if (hex::executeCommand("grep -q 'VERSION_ID=\"25.04\"' /etc/os-release") == 0)
|
else if (hex::executeCommand("grep -q 'VERSION_ID=\"25.04\"' /etc/os-release") == 0)
|
||||||
return ARCH_DEPENDENT("Ubuntu-25.04-x86_64.deb", "");
|
return ARCH_DEPENDENT("Ubuntu-25.04-x86_64.deb", "");
|
||||||
} else if (hex::executeCommand("grep -q 'ID=fedora' /etc/os-release") == 0) {
|
} else if (hex::executeCommand("grep -q 'ID=fedora' /etc/os-release") == 0) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue