From 6ed2e116fcd7776955d133ce40ed5351ecd73df9 Mon Sep 17 00:00:00 2001 From: B0TLANNER <16349308+BOTLANNER@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:44:58 +0200 Subject: [PATCH 1/3] Updated export name for linux in demo and fixed root level libraries section --- .github/workflows/build-gdextension.yml | 2 ++ demo/addons/godotgif/godotgif.gdextension | 12 ++++++------ godotgif.gdextension | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-gdextension.yml b/.github/workflows/build-gdextension.yml index 582e4b2..3e61f7d 100644 --- a/.github/workflows/build-gdextension.yml +++ b/.github/workflows/build-gdextension.yml @@ -185,6 +185,8 @@ jobs: mkdir -p project/addons/godotgif mv demo/addons/godotgif/* project/addons/godotgif + cd project/addons/godotgif + rm -rf 'godotgif.gdextension' || true cd project/addons/godotgif/bin rm -rf *.exp *.lib || true cd ../../../.. diff --git a/demo/addons/godotgif/godotgif.gdextension b/demo/addons/godotgif/godotgif.gdextension index b05a09b..08ccd9a 100644 --- a/demo/addons/godotgif/godotgif.gdextension +++ b/demo/addons/godotgif/godotgif.gdextension @@ -11,12 +11,12 @@ windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll" windows.release.x86_32 = "bin/godotgif.windows.template_release.x86_32.dll" windows.debug.x86_64 = "bin/godotgif.windows.template_debug.x86_64.dll" windows.release.x86_64 = "bin/godotgif.windows.template_release.x86_64.dll" -linux.debug.x86_64 = "bin/godotgif.linux.template_debug.x86_64.so" -linux.release.x86_64 = "bin/godotgif.linux.template_release.x86_64.so" -linux.debug.arm64 = "bin/godotgif.linux.template_debug.arm64.so" -linux.release.arm64 = "bin/godotgif.linux.template_release.arm64.so" -linux.debug.rv64 = "bin/godotgif.linux.template_debug.rv64.so" -linux.release.rv64 = "bin/godotgif.linux.template_release.rv64.so" +linux.debug.x86_64 = "bin/libgodotgif.linux.template_debug.x86_64.so" +linux.release.x86_64 = "bin/libgodotgif.linux.template_release.x86_64.so" +linux.debug.arm64 = "bin/libgodotgif.linux.template_debug.arm64.so" +linux.release.arm64 = "bin/libgodotgif.linux.template_release.arm64.so" +linux.debug.rv64 = "bin/libgodotgif.linux.template_debug.rv64.so" +linux.release.rv64 = "bin/libgodotgif.linux.template_release.rv64.so" android.debug.x86_64 = "bin/godotgif.android.template_debug.x86_64.so" android.release.x86_64 = "bin/godotgif.android.template_release.x86_64.so" android.debug.arm64 = "bin/godotgif.android.template_debug.arm64.so" diff --git a/godotgif.gdextension b/godotgif.gdextension index 15681a4..08ccd9a 100644 --- a/godotgif.gdextension +++ b/godotgif.gdextension @@ -3,6 +3,8 @@ entry_symbol = "godot_gif_library_init" compatibility_minimum = "4.1" +[libraries] + macos.debug = "bin/godotgif.macos.template_debug.framework" macos.release = "bin/godotgif.macos.template_release.framework" windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll" From 5d9b8761c8ff82195313dbad584ca4ba5453e722 Mon Sep 17 00:00:00 2001 From: B0TLANNER <16349308+BOTLANNER@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:56:35 +0200 Subject: [PATCH 2/3] Update ca certs to attempt fix for apt-get update ssl issues --- .github/workflows/build-gdextension.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-gdextension.yml b/.github/workflows/build-gdextension.yml index 3e61f7d..b5ee0a1 100644 --- a/.github/workflows/build-gdextension.yml +++ b/.github/workflows/build-gdextension.yml @@ -105,10 +105,11 @@ jobs: if: ${{ startsWith(matrix.opts.identifier, 'linux-') && contains(matrix.opts.arch, 'x86_64')}} shell: sh run: | + sudo update-ca-certificates -v sudo apt-get update sudo apt-get install yasm cd /opt - curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 + curl -LO -k https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 tar xf x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 rm -f x86_64-godot-linux-gnu_sdk-buildroot.tar.bz2 mv x86_64-godot-linux-gnu_sdk-buildroot buildroot @@ -119,10 +120,11 @@ jobs: if: ${{ startsWith(matrix.opts.identifier, 'linux-') && contains(matrix.opts.arch, 'x86_32')}} shell: sh run: | + sudo update-ca-certificates -v sudo apt-get update sudo apt-get install yasm cd /opt - curl -LO https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2 + curl -LO -k https://downloads.tuxfamily.org/godotengine/toolchains/linux/2021-02-11/i686-godot-linux-gnu_sdk-buildroot.tar.bz2 tar xf i686-godot-linux-gnu_sdk-buildroot.tar.bz2 rm -f i686-godot-linux-gnu_sdk-buildroot.tar.bz2 mv i686-godot-linux-gnu_sdk-buildroot buildroot From df99a381749742280c3495df1cbe729e81c66e3a Mon Sep 17 00:00:00 2001 From: B0TLANNER <16349308+BOTLANNER@users.noreply.github.com> Date: Wed, 15 Nov 2023 15:58:12 +0200 Subject: [PATCH 3/3] Update to build --- .github/workflows/build-gdextension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-gdextension.yml b/.github/workflows/build-gdextension.yml index b5ee0a1..23b4f9c 100644 --- a/.github/workflows/build-gdextension.yml +++ b/.github/workflows/build-gdextension.yml @@ -189,7 +189,7 @@ jobs: cd project/addons/godotgif rm -rf 'godotgif.gdextension' || true - cd project/addons/godotgif/bin + cd ./bin rm -rf *.exp *.lib || true cd ../../../..