From 872c765ca0ce1fbd7232d98b2024d755f5b522d0 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Tue, 16 Jun 2026 22:01:19 +0100 Subject: [PATCH] clean Removed intel runner from mac, it never run Removed arm from windows as it will always fail as git ci runners are not arm removed gcc12 kept gcc13 Added convenience function for checking if a package is active --- .github/workflows/build-linux-gcc.yml | 9 --------- .github/workflows/build-macos-clang.yml | 10 ---------- .github/workflows/build-windows-msvc.yml | 12 ------------ Engine/source/console/consoleInternal.cpp | 22 ++++++++++++++++++++++ Engine/source/console/consoleInternal.h | 1 + 5 files changed, 23 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml index 952641aff..c938c1325 100644 --- a/.github/workflows/build-linux-gcc.yml +++ b/.github/workflows/build-linux-gcc.yml @@ -21,15 +21,6 @@ jobs: fail-fast: false matrix: config: - # Explicit older GCC versions catch deprecation warnings before - # they become the runner default and break the build silently. - - { - name: "Ubuntu GCC 12", - build_type: "Release", - cc: "gcc-12", - cxx: "g++-12", - generator: "Ninja", - } - { name: "Ubuntu GCC 13", build_type: "Release", diff --git a/.github/workflows/build-macos-clang.yml b/.github/workflows/build-macos-clang.yml index 1f65cf0f4..796e2bd96 100644 --- a/.github/workflows/build-macos-clang.yml +++ b/.github/workflows/build-macos-clang.yml @@ -21,8 +21,6 @@ jobs: fail-fast: false matrix: config: - # macos-latest is Apple Silicon (arm64). The Intel entry below - # covers x86_64 users who haven't migrated yet. - { name: "macOS ARM Clang Ninja", os: "macos-latest", @@ -31,14 +29,6 @@ jobs: cxx: "clang++", generator: "Ninja", } - - { - name: "macOS Intel Clang Ninja", - os: "macos-13", - build_type: "Release", - cc: "clang", - cxx: "clang++", - generator: "Ninja", - } - { name: "macOS ARM Xcode", os: "macos-latest", diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml index c760002f8..d62b0690f 100644 --- a/.github/workflows/build-windows-msvc.yml +++ b/.github/workflows/build-windows-msvc.yml @@ -57,18 +57,6 @@ jobs: msvc_arch: "amd64", can_test: true, } - - { - name: "Windows ARM64 MSVC", - os: "windows-latest", - build_type: "Release", - cc: "cl", - cxx: "cl", - generator: "Visual Studio 18 2026", - cmake_args: "-A ARM64", - compiler_family: "msvc", - msvc_arch: "amd64_arm64", - can_test: false, - } steps: - uses: actions/checkout@v4 diff --git a/Engine/source/console/consoleInternal.cpp b/Engine/source/console/consoleInternal.cpp index fbbd28193..4e97a88d2 100644 --- a/Engine/source/console/consoleInternal.cpp +++ b/Engine/source/console/consoleInternal.cpp @@ -1748,6 +1748,28 @@ void Namespace::relinkPackages() activatePackage(mActivePackages[i]); } +bool Namespace::isPackageActive(StringTableEntry name) +{ + S32 x; + + for (x = 0; x < mNumActivePackages; x++) + { + if (mActivePackages[x] == name) + { + return true; + } + } + + return false; +} + +DefineEngineFunction(isPackageActive, bool, (String identifier), , + "@brief Returns true if the identifier is a package and is active, otherwise false.\n\n" + "@ingroup Packages\n") +{ + StringTableEntry name = StringTable->insert(identifier.c_str()); + return Namespace::isPackageActive(name); +} DefineEngineFunction(isPackage, bool, (String identifier), , "@brief Returns true if the identifier is the name of a declared package.\n\n" diff --git a/Engine/source/console/consoleInternal.h b/Engine/source/console/consoleInternal.h index 735e9da58..93507d7ed 100644 --- a/Engine/source/console/consoleInternal.h +++ b/Engine/source/console/consoleInternal.h @@ -275,6 +275,7 @@ public: static void printNamespaceEntries(Namespace * g, bool dumpScript = true, bool dumpEngine = true); static void unlinkPackages(); static void relinkPackages(); + static bool isPackageActive(StringTableEntry name); static bool isPackage(StringTableEntry name); static U32 getActivePackagesCount(); static StringTableEntry getActivePackage(U32 index);