Skip to content

Commit

Permalink
Fix remove native WebGL build from Makefile and build pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
gilzoide committed Feb 15, 2025
1 parent c60eb4a commit 8e03acd
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 17 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
target: docker-all-linux
- platform: android
target: docker-all-android
- platform: webgl
target: docker-all-webgl
steps:
- uses: actions/checkout@v3
- name: Cache Docker files
Expand All @@ -37,7 +35,6 @@ jobs:
with:
name: gilzoide-sqlite-net-${{ matrix.platform }}
path: |
Plugins/lib/${{ matrix.platform }}/**/*.bc
Plugins/lib/${{ matrix.platform }}/**/*.dll
Plugins/lib/${{ matrix.platform }}/**/*.dylib
Plugins/lib/${{ matrix.platform }}/**/*.so
Expand Down
12 changes: 1 addition & 11 deletions Plugins/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Android setup
ANDROID_NDK_ROOT ?=
# WebGL/Emscripten setup
EMCC ?= emcc
# macOS code signing setup
CODESIGN ?= codesign
MACOS_CODESIGN_SIGNATURE ?=
Expand All @@ -20,8 +18,7 @@ BUILD_DIRS = \
lib/windows/x86_64 lib/windows/x86 lib/windows/arm64 \
lib/linux/x86_64 lib/linux/x86 \
lib/macos \
lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64 \
lib/webgl
lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64

SQLITE_SRC = sqlite-amalgamation/sqlite3.c
SQLITE_NET_SRC = $(wildcard sqlite-net~/src/*.cs) sqlite-net~/LICENSE.txt
Expand Down Expand Up @@ -105,14 +102,11 @@ android-arm32: lib/android/arm32/libgilzoide-sqlite-net.so
android-x86_64: lib/android/x86_64/libgilzoide-sqlite-net.so
android-x86: lib/android/x86/libgilzoide-sqlite-net.so

webgl: lib/webgl/libgilzoide-sqlite-net.bc

source: $(SQLITE_NET_DEST)/License.txt $(SQLITE_NET_DEST)/AssemblyInfo.cs $(SQLITE_NET_DEST)/SQLite.cs $(SQLITE_NET_DEST)/SQLiteAsync.cs

all-android: android-arm64 android-arm32 android-x86_64 android-x86
all-apple: macos-universal
all-linux: linux-x86_64
all-webgl: webgl
all-windows: windows-x86_64 windows-x86
all-windows-mingw: windows-mingw-x86_64 windows-mingw-x86
all-windows-llvm-mingw: windows-mingw-x86_64 windows-mingw-x86 windows-mingw-arm64
Expand All @@ -124,9 +118,6 @@ docker-all-android:
docker-all-linux:
docker build -f tools~/Dockerfile.build.linux --platform=linux/amd64 -t gilzoide-sqlite-net-build-linux:latest $(DOCKER_BUILD_ARGS) .
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-linux:latest make all-linux
docker-all-webgl:
docker build -f tools~/Dockerfile.build.webgl -t gilzoide-sqlite-net-build-webgl:latest $(DOCKER_BUILD_ARGS) .
docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-webgl:latest make all-webgl
docker-all-windows:
docker build -f tools~/Dockerfile.build.windows -t gilzoide-sqlite-net-build-windows:latest $(DOCKER_BUILD_ARGS) .
docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-windows:latest make all-windows-mingw
Expand All @@ -141,5 +132,4 @@ download-latest-build:
rsync -r $(TMPDIR)/gilzoide-sqlite-net-linux/* lib/linux/
rsync -r $(TMPDIR)/gilzoide-sqlite-net-android/* lib/android/
rsync -r $(TMPDIR)/gilzoide-sqlite-net-macos/* lib/macos/
rsync -r $(TMPDIR)/gilzoide-sqlite-net-webgl/* lib/webgl/
$(RM) -r $(TMPDIR)
3 changes: 0 additions & 3 deletions Plugins/tools~/Dockerfile.build.webgl

This file was deleted.

0 comments on commit 8e03acd

Please sign in to comment.