Skip to content

Commit 8e03acd

Browse files
committed
Fix remove native WebGL build from Makefile and build pipeline
1 parent c60eb4a commit 8e03acd

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

.github/workflows/build.yml

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
target: docker-all-linux
2222
- platform: android
2323
target: docker-all-android
24-
- platform: webgl
25-
target: docker-all-webgl
2624
steps:
2725
- uses: actions/checkout@v3
2826
- name: Cache Docker files
@@ -37,7 +35,6 @@ jobs:
3735
with:
3836
name: gilzoide-sqlite-net-${{ matrix.platform }}
3937
path: |
40-
Plugins/lib/${{ matrix.platform }}/**/*.bc
4138
Plugins/lib/${{ matrix.platform }}/**/*.dll
4239
Plugins/lib/${{ matrix.platform }}/**/*.dylib
4340
Plugins/lib/${{ matrix.platform }}/**/*.so

Plugins/Makefile

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Android setup
22
ANDROID_NDK_ROOT ?=
3-
# WebGL/Emscripten setup
4-
EMCC ?= emcc
53
# macOS code signing setup
64
CODESIGN ?= codesign
75
MACOS_CODESIGN_SIGNATURE ?=
@@ -20,8 +18,7 @@ BUILD_DIRS = \
2018
lib/windows/x86_64 lib/windows/x86 lib/windows/arm64 \
2119
lib/linux/x86_64 lib/linux/x86 \
2220
lib/macos \
23-
lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64 \
24-
lib/webgl
21+
lib/android/arm64 lib/android/arm32 lib/android/x86 lib/android/x86_64
2522

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

108-
webgl: lib/webgl/libgilzoide-sqlite-net.bc
109-
110105
source: $(SQLITE_NET_DEST)/License.txt $(SQLITE_NET_DEST)/AssemblyInfo.cs $(SQLITE_NET_DEST)/SQLite.cs $(SQLITE_NET_DEST)/SQLiteAsync.cs
111106

112107
all-android: android-arm64 android-arm32 android-x86_64 android-x86
113108
all-apple: macos-universal
114109
all-linux: linux-x86_64
115-
all-webgl: webgl
116110
all-windows: windows-x86_64 windows-x86
117111
all-windows-mingw: windows-mingw-x86_64 windows-mingw-x86
118112
all-windows-llvm-mingw: windows-mingw-x86_64 windows-mingw-x86 windows-mingw-arm64
@@ -124,9 +118,6 @@ docker-all-android:
124118
docker-all-linux:
125119
docker build -f tools~/Dockerfile.build.linux --platform=linux/amd64 -t gilzoide-sqlite-net-build-linux:latest $(DOCKER_BUILD_ARGS) .
126120
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-linux:latest make all-linux
127-
docker-all-webgl:
128-
docker build -f tools~/Dockerfile.build.webgl -t gilzoide-sqlite-net-build-webgl:latest $(DOCKER_BUILD_ARGS) .
129-
docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-webgl:latest make all-webgl
130121
docker-all-windows:
131122
docker build -f tools~/Dockerfile.build.windows -t gilzoide-sqlite-net-build-windows:latest $(DOCKER_BUILD_ARGS) .
132123
docker run --rm -v "$(CURDIR)":/src -w /src gilzoide-sqlite-net-build-windows:latest make all-windows-mingw
@@ -141,5 +132,4 @@ download-latest-build:
141132
rsync -r $(TMPDIR)/gilzoide-sqlite-net-linux/* lib/linux/
142133
rsync -r $(TMPDIR)/gilzoide-sqlite-net-android/* lib/android/
143134
rsync -r $(TMPDIR)/gilzoide-sqlite-net-macos/* lib/macos/
144-
rsync -r $(TMPDIR)/gilzoide-sqlite-net-webgl/* lib/webgl/
145135
$(RM) -r $(TMPDIR)

Plugins/tools~/Dockerfile.build.webgl

-3
This file was deleted.

0 commit comments

Comments
 (0)