[DOCKER] Containers for wasm.

.github/workflows/build_containers.yml

@@ -5,7 +5,7 @@ on:
       - 'docker/**'
       - '.github/workflows/build_containers.yml'
 jobs:
-  build_skiabuild:
+  build_skiabuild-x86_64-linux-gnu:
     runs-on: [self-hosted, linux, x64]
     container: jameswalmsley/container-builder:latest
     steps:
@@ -19,15 +19,35 @@ jobs:
           username: ${{ secrets.JAMES_DOCKER_HUB_USERNAME }}
           password: ${{ secrets.JAMES_DOCKER_HUB_PASSWORD }}
 
-      - name: Build skiabuild:latest
+      - name: Build skiabuild:x86_64-linux-gnu
         uses: docker/build-push-action@v2
         with:
           context: docker/skiabuild
           file: docker/skiabuild/Dockerfile
           push: true
-          tags: jameswalmsley/skiabuild:latest
+          tags: jameswalmsley/skiabuild:x86_64-linux-gnu
 
+  build_skiabuild-wasm:
+    runs-on: [self-hosted, linux, x64]
+    container: jameswalmsley/container-builder:latest
+    steps:
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v2
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.JAMES_DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.JAMES_DOCKER_HUB_PASSWORD }}
+
+      - name: Build skiabuild:wasm
+        uses: docker/build-push-action@v2
+        with:
+          context: docker/skiabuild
+          file: docker/skiabuild/wasm.Dockerfile
+          push: true
+          tags: jameswalmsley/skiabuild:wasm
 
   build_skiatest-archlinux:
     runs-on: ubuntu-latest

.github/workflows/skiabuild.yml

@@ -6,6 +6,28 @@ jobs:
   #   steps:
   #     - run: printenv
 
+  build_wasm:
+    runs-on: [self-hosted, linux, x64]
+    container: jameswalmsley/skiabuild:wasm
+    steps:
+      - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - name: Build Skia
+        run: |
+          make skia-wasm_defconfig
+          make source-checkout -j$(nproc)
+          make
+         
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - uses: actions/upload-artifact@v3
+        with:
+          name: libskia-wasm
+          path: out/skia/wasm/sysroot.tar.gz
+
+
   build_windows:
     runs-on: windows-latest
     steps:
@@ -30,7 +52,7 @@ jobs:
 
   build_skia_64:
     runs-on: [self-hosted, linux, x64]
-    container: jameswalmsley/skiabuild:latest
+    container: jameswalmsley/skiabuild:x86_64-linux-gnu
     steps:
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
       - name: Check out repository code

configs/skia-wasm_defconfig

@@ -4,6 +4,8 @@ CONFIG_VARIANT:=wasm
 CONFIG_SYSROOT:=y
 CONFIG_SKIACONFIG:=wasm
 
+DOCKER_SERVICE:=skiabuild-wasm
+
 SKIA_CC:=emcc
 SKIA_CXX:=em++
 SKIA_AR:=emar

docker/skiabuild/docker-compose.yml

@@ -26,6 +26,32 @@ services:
     entrypoint: /entrypoint.sh
     working_dir: /work
 
+  skiabuild-wasm:
+    build:
+      context: .
+      dockerfile: wasm.Dockerfile
+    volumes:
+      - /home/${CURRENT_USER}:/home/${CURRENT_USER}
+      - ./entrypoint.sh:/entrypoint.sh
+      - ./userentry.sh:/userentry.sh
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      - /dev:/dev
+      - /tmp:/tmp
+    environment:
+      - DISPLAY
+      - CURRENT_UID
+      - CURRENT_GID
+      - CURRENT_USER
+      - CURRENT_DIR
+      - DISTCC_HOSTS
+      - TERM=xterm-256color
+    hostname: skiabuild
+    stdin_open: true
+    tty: true
+    privileged: true
+    entrypoint: /entrypoint.sh
+    working_dir: /work
+
   skiabuild_ci:
     build:
       context: .

docker/skiabuild/userentry.sh

@@ -2,5 +2,7 @@
 
 export PATH="/usr/local/bin:$PATH"
 
+export HOME=/home/${CURRENT_USER}
+
 cd $1
 exec $2

docker/skiabuild/wasm.Dockerfile

@@ -0,0 +1,9 @@
+FROM archlinux:latest
+
+RUN pacman -Syu --noconfirm \
+        base-devel
+
+RUN pacman -Syu --noconfirm \
+        ninja \
+        meson \
+        git

recipes/skia/layers/skia.mk

@@ -35,7 +35,10 @@ $(skia_sync_deps):
 	cd $(srcdir)/skia && python3 ./tools/git-sync-deps
 	$(stamp)
 
+SKIA_ARGS += skia_enable_tools=false
+
 include $(RECIPE)/skia-config-$(CONFIG_SKIACONFIG).mk
+
 SKIA_ARGS += cc=\"$(SKIA_CC)\"
 SKIA_ARGS += cxx=\"$(SKIA_CXX)\"
 SKIA_ARGS += ar=\"$(SKIA_AR)\"

recipes/skia/skia-config-wasm.mk

@@ -32,4 +32,3 @@ SKIA_ARGS +=   \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\", \"-DGR_GL_CHECK_ALLOC_W
 SKIA_ARGS += ]
 SKIA_ARGS += extra_cflags_cc=[ \"-frtti\" ]
 
-