From 6566dc9366ed37904a02b83bd9f4f5a92ef37735 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Thu, 8 May 2025 23:55:44 -0500 Subject: [PATCH 1/7] Add dependency action --- .github/actions/install_linux_deps/action.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/actions/install_linux_deps/action.yml diff --git a/.github/actions/install_linux_deps/action.yml b/.github/actions/install_linux_deps/action.yml new file mode 100644 index 0000000000..38a6bbc808 --- /dev/null +++ b/.github/actions/install_linux_deps/action.yml @@ -0,0 +1,14 @@ +name: Install Linux dependencies +description: Ensures all dependencies are installed + +runs: + using: composite + steps: + - name: Update repository cache + shell: sh + run: sudo apt-get update + + - name: Install dependencies + shell: sh + run: sudo apt-get install -y build-essential pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev libwayland-dev + From 70ed8c4ef463a96f0766660f9b6c8243cc470ea8 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Fri, 9 May 2025 00:00:01 -0500 Subject: [PATCH 2/7] Rename file to kebab case Snake case is ssssssuperior --- .../actions/{install_linux_deps/action.yml => install-linux-deps} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/actions/{install_linux_deps/action.yml => install-linux-deps} (100%) diff --git a/.github/actions/install_linux_deps/action.yml b/.github/actions/install-linux-deps similarity index 100% rename from .github/actions/install_linux_deps/action.yml rename to .github/actions/install-linux-deps From 98e6bb0e73aaffbd249c645921728d2e82437669 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Fri, 9 May 2025 00:02:53 -0500 Subject: [PATCH 3/7] Workaround Yes I am hastily doing this on my phone --- .github/actions/{install-linux-deps => install-linux-dep111} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/actions/{install-linux-deps => install-linux-dep111} (100%) diff --git a/.github/actions/install-linux-deps b/.github/actions/install-linux-dep111 similarity index 100% rename from .github/actions/install-linux-deps rename to .github/actions/install-linux-dep111 From d31fef45bc5b60fc5dbe357c1906f18dec9f6999 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Fri, 9 May 2025 00:04:00 -0500 Subject: [PATCH 4/7] Jigsaw falling into place So, there is nothing to explain --- .../{install-linux-dep111 => install-linux-deps/action.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/actions/{install-linux-dep111 => install-linux-deps/action.yml} (100%) diff --git a/.github/actions/install-linux-dep111 b/.github/actions/install-linux-deps/action.yml similarity index 100% rename from .github/actions/install-linux-dep111 rename to .github/actions/install-linux-deps/action.yml From efea938ca10c32cafe3d805138d22eb7171d94cc Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Fri, 9 May 2025 00:10:12 -0500 Subject: [PATCH 5/7] Add dependency checks to Linux build Okay, apt is doing the heavy lifting with the "check" here --- .github/workflows/build_linux.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index a976e6f018..51614f98a4 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -72,6 +72,9 @@ jobs: - name: Setup python and scons uses: ./.github/actions/godot-deps + - name: Install dependencies + uses: ./modules/kotlin_jvm/.github/actions/install-linux-deps + - name: Compilation uses: ./.github/actions/godot-build with: From ca1f322f44b17b88e1b1f2e09b30f9ebdcf93c35 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Fri, 9 May 2025 12:55:42 -0500 Subject: [PATCH 6/7] Update action.yml Remove excess dependencies --- .github/actions/install-linux-deps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml index 38a6bbc808..d49147d427 100644 --- a/.github/actions/install-linux-deps/action.yml +++ b/.github/actions/install-linux-deps/action.yml @@ -10,5 +10,5 @@ runs: - name: Install dependencies shell: sh - run: sudo apt-get install -y build-essential pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu1-mesa-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev libwayland-dev + run: sudo apt-get install -y libasound2-dev libpulse-dev libudev-dev libwayland-dev g++ From 1da19b116676c6ee6d6837870f022a23a19f3af3 Mon Sep 17 00:00:00 2001 From: Moon <64157802+signalno11@users.noreply.github.com> Date: Sat, 10 May 2025 11:13:41 -0500 Subject: [PATCH 7/7] Update action.yml --- .github/actions/install-linux-deps/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/install-linux-deps/action.yml b/.github/actions/install-linux-deps/action.yml index d49147d427..04be815930 100644 --- a/.github/actions/install-linux-deps/action.yml +++ b/.github/actions/install-linux-deps/action.yml @@ -10,5 +10,5 @@ runs: - name: Install dependencies shell: sh - run: sudo apt-get install -y libasound2-dev libpulse-dev libudev-dev libwayland-dev g++ + run: sudo apt-get install -y libwayland-dev