build-system updates

- added support for arm64 on Alpine (fixes samizdatco#95)
- debian-stretch no longer supports clang through backports, so moved to buster
- alpine builds now just pull gn & ninja from the edge distro, leaving libstdc++ compatible with what's on the node:alpine docker image (fixes samizdatco#97)
- the glibc & musl images are now multiplatform, so if arm-based runners are ever a thing they'll be ready…
- self-hosted musl/arm64 builds can’t use js-based workflow actions (as of june 2022) so the arm64 build is all shell for now

Author: samizdatco

.github/workflows/arch.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  intel:
+  server:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -13,30 +13,29 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v1
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.CR_PAT }}
 
-    - name: Build and Push Docker Image
-      uses: docker/build-push-action@v2
+    - name: Build and push
+      uses: docker/build-push-action@v3
       with:
         tags: ghcr.io/${{ github.repository }}-${{ matrix.libc }}:latest
         context: arch/${{ matrix.libc }}
+        platforms: linux/amd64,linux/arm64
         push: true
 
-  acorn:
-    runs-on:
-    - self-hosted
-    - linux
-    - ${{ matrix.runner }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [ARM, ARM64]
+  pi:
+    runs-on: [self-hosted, linux, ARM]
 
     steps:
     - name: Checkout
@@ -49,16 +48,11 @@ jobs:
         username: ${{ github.repository_owner }}
         password: ${{ secrets.CR_PAT }}
 
-    - id: cpu
-      uses: ASzc/change-string-case-action@v1
-      with:
-        string: ${{ matrix.runner }}
-
     - name: Build and Push Docker Image
       run: |
         cd ${{ env.context }}
         docker build . -t ${{ env.tag }}
         docker push ${{ env.tag }}
       env:
-        context: arch/${{ steps.cpu.outputs.lowercase }}
-        tag: ghcr.io/${{ github.repository }}-${{ steps.cpu.outputs.lowercase }}:latest
+        context: arch/arm
+        tag: ghcr.io/${{ github.repository }}-arm:latest

.github/workflows/build.yml

@@ -17,38 +17,115 @@ jobs:
       image: ${{ format('ghcr.io/{0}-{1}:latest', github.repository, matrix.libc) }}
 
     steps:
-    - name: Checkout repository
+    - name: Install rust
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
+        echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+    - name: Checkout skia-canvas
       uses: actions/checkout@v2
       with:
         path: skia-canvas
 
+    - name: Determine current upstream version
+      id: rust-skia
+      run: |
+        export TAG=$(awk '/\[dependencies.skia-safe\]/{getline; print}' skia-canvas/Cargo.toml | egrep -o '[0-9\.]+')
+        echo "::set-output name=VERSION::$TAG"
+
+    - name: Checkout rust-skia
+      if: ${{ matrix.libc == 'musl' }}
+      uses: actions/checkout@v2
+      with:
+        repository: rust-skia/rust-skia
+        ref: ${{ steps.rust-skia.outputs.VERSION }}
+        submodules: true
+        path: rust-skia
+
+    - name: Patch build files
+      if: ${{ matrix.libc == 'musl' }}
+      run: |
+        patch -p0 < /code/alpine-build.patch
+        perl -0777 -pi.bak -e 's/(\[dependencies.skia-safe\]\n)version.*/$1path = "..\/rust-skia\/skia-safe"/m' skia-canvas/Cargo.toml
+
+    - name: Build module
+      run: |
+        cd skia-canvas
+        npm ci --ignore-scripts
+        npm run build -- --release --features skia-safe/embed-freetype
+
+    - name: Package module
+      run: |
+        cd skia-canvas
+        npm test && npm run package
+
+    - name: Upload to S3
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      run: |
+        cd skia-canvas
+        npm run upload
+
+
+  linux-arm64:
+    runs-on:
+      - self-hosted
+      - linux
+      - ARM64
+    strategy:
+      fail-fast: false
+      matrix:
+        libc: [glibc, musl]
+
+    container:
+      image: ${{ format('ghcr.io/{0}-{1}:latest', github.repository, matrix.libc) }}
+      options: --user 1000:1000
+
+    steps:
+    - name: Prepare workspace
+      run: |
+        rm -rf "$GITHUB_WORKSPACE"
+        mkdir -p "$GITHUB_WORKSPACE"
+
     - name: Install rust
       run: |
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
-    - name: Checkout rust-skia
+    - name: Checkout skia-canvas
       id: rust-skia
+      env:
+        SERVER: ${{ github.server_url }}
+        REPO: ${{ github.repository }}
       run: |
-        export TAG=$(awk '/skia-safe/{getline; print}' skia-canvas/Cargo.toml | egrep -o '[0-9\.]+')
-        git clone --depth 1 --branch $TAG https://github.com/rust-skia/rust-skia.git
+        git clone --depth 1 ${SERVER}/${REPO} skia-canvas
+        export TAG=$(awk '/\[dependencies.skia-safe\]/{getline; print}' skia-canvas/Cargo.toml | egrep -o '[0-9\.]+')
+        perl -0777 -pi.bak -e 's/(\[dependencies.skia-safe\]\n)version.*/$1path = "..\/rust-skia\/skia-safe"/m' skia-canvas/Cargo.toml
+        echo "::set-output name=VERSION::$TAG"
+
+    - name: Checkout rust-skia
+      run: |
+        git clone --depth 1 --branch ${{ steps.rust-skia.outputs.VERSION }} https://github.com/rust-skia/rust-skia.git
         cd rust-skia
         git submodule update --init --depth 1 skia-bindings/skia
         git submodule update --init --depth 1 skia-bindings/depot_tools
 
-    - name: Patch build files
+    - name: Apply patches
       if: ${{ matrix.libc == 'musl' }}
       run: |
         patch -p0 < /code/alpine-build.patch
+
+    - name: Use system GN
+      if: ${{ matrix.libc == 'musl' }}
+      run: |
         echo "#!/bin/true" > rust-skia/skia-bindings/skia/bin/fetch-gn
-        perl -0777 -pi.bak -e 's/(\[dependencies.skia-safe\]\n)version.*/$1path = "..\/rust-skia\/skia-safe"/m' skia-canvas/Cargo.toml
 
     - name: Build module
       run: |
         cd skia-canvas
-        perl -0777 -pi.bak -e 's/("textlayout")/$1, "embed-freetype"/' Cargo.toml
         npm ci --ignore-scripts
-        npm run build -- --release
+        npm run build -- --release --features skia-safe/embed-freetype
 
     - name: Package module
       run: |
@@ -68,31 +145,26 @@ jobs:
     runs-on:
       - self-hosted
       - linux
-      - ${{ matrix.runner }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner: [ARM, ARM64]
-        include:
-          - runner: ARM
-            container: ${{ format('ghcr.io/{0}-{1}:latest', github.repository, 'arm') }}
-          - runner: ARM64
-            container: ${{ format('ghcr.io/{0}-{1}:latest', github.repository, 'arm64') }}
-
+      - ARM
     container:
-      image: ${{ matrix.container }}
+      image: ${{ format('ghcr.io/{0}-{1}:latest', github.repository, 'arm') }}
 
     steps:
-    - name: Use Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: 14
+    - name: Prepare workspace
+      run: |
+        rm -rf "$GITHUB_WORKSPACE"
+        mkdir -p "$GITHUB_WORKSPACE"
 
     - name: Install rust
       run: |
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
         echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
+    - name: Use Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: 14
+
     - name: Checkout repository
       uses: actions/checkout@v2
       with:
@@ -117,15 +189,14 @@ jobs:
         perl -0777 -pi.bak -e 's/(\[dependencies.skia-safe\]\n)version.*/$1path = "..\/rust-skia\/skia-safe"/m' skia-canvas/Cargo.toml
 
     - name: Use system GN
-      if: ${{ matrix.runner == 'ARM' }}
       run: |
         echo "#!/bin/true" > rust-skia/skia-bindings/skia/bin/fetch-gn
 
     - name: Build module
       run: |
         cd skia-canvas
         npm ci --ignore-scripts
-        npm run build -- --release
+        npm run build -- --release --features skia-safe/embed-freetype
 
     - name: Package module
       run: |

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Enhacements to the shared **FontLibrary** object:
   - Added a [`reset()`][FontLibrary.reset] method to FontLibrary which uninstalls any fonts that had been dynamically installed via `FontLibrary.use()`
   - The [`use()`][FontLibrary.use] method now checks for previously installed fonts with the same family name (or alias) and will replace them with the newly added font
+- Added pre-compiled binaries for Alpine Linux on arm64
 
 ### Bugfixes
 
@@ -16,6 +17,7 @@
 - [`conicCurveTo()`][conicCurveTo] now correctly reflects the canvas's transform state
 - The browser-based version of [`loadImage()`][loadImage] now returns a **Promise** that correctly resolves to an **Image** object
 - SVG exports no longer have an invisible, canvas-sized `<rect/>` as their first element
+- Fixed an incompatibility on Alpine between the version of libstdc++ present on the `node:alpine` docker images and the version used when building the precompiled binaries
 
 ### Misc. Improvements
 - Upgraded Skia to milestone 101

README.md

@@ -52,7 +52,7 @@ Nearly everything you need is statically linked into the library. A notable exce
 
 ### Running in Docker
 
-The library is compatible with Linux systems using [glibc](https://www.gnu.org/software/libc/) 2.24 or later as well as Alpine Linux (x64 only) and the [musl](https://musl.libc.org) C library it favors. In both cases, Fontconfig must be installed on the system for `skia-canvas` to operate correctly.
+The library is compatible with Linux systems using [glibc](https://www.gnu.org/software/libc/) 2.24 or later as well as Alpine Linux (x64 & arm64) and the [musl](https://musl.libc.org) C library it favors. In both cases, Fontconfig must be installed on the system for `skia-canvas` to operate correctly.
 
 If you are setting up a [Dockerfile](https://nodejs.org/en/docs/guides/nodejs-docker-webapp/) that uses [`node`](https://hub.docker.com/_/node) as its basis, the simplest approach is to set your `FROM` image to one of the (Debian-derived) defaults like `node:16`, `node:14`, `node:12`, `node:bullseye`, `node:buster`, or simply:
 ```dockerfile
@@ -71,7 +71,6 @@ If you wish to use Alpine as the underlying distribution, you can start with som
 ```dockerfile
 FROM node:alpine
 RUN apk update && apk add fontconfig
-RUN apk -UvX http://dl-cdn.alpinelinux.org/alpine/edge/main add -u nodejs
 ```
 
 ### Compiling from Source

arch/arm/Dockerfile

@@ -17,5 +17,5 @@ ENV SKIA_GN_COMMAND="/usr/local/bin/gn"
 ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"
 
 RUN groupadd -r -g 1000 pi
-RUN useradd -r -u 1000 -g pi pi
+RUN useradd -r -m -u 1000 -g pi pi
 USER pi

arch/arm64/Dockerfile

@@ -1,17 +1,14 @@
-FROM node:lts-stretch-slim
+FROM node:buster-slim
 
-RUN apt-get update && apt-get install -y -q software-properties-common
-RUN add-apt-repository "deb http://deb.debian.org/debian stretch-backports main"
-RUN apt-get update && apt-get install -y \
-    curl less build-essential lsb-release wget python2.7  \
-    libssl-dev libfontconfig-dev git clang-5.0 lld-5.0
+RUN apt-get update && \
+    apt-get install -y -q \
+    python2 python3 perl git clang lldb lld \
+    build-essential software-properties-common \
+    libssl-dev libfontconfig-dev \
+    ninja-build
 
-RUN ln -s /usr/bin/clang++-5.0   /usr/bin/clang++
-RUN ln -s /usr/bin/clang-5.0     /usr/bin/clang
-RUN ln -s /usr/bin/clang-cpp-5.0 /usr/bin/clang-cpp
-RUN ln -s /usr/bin/ld.lld-5.0    /usr/bin/ld.lld
-RUN ln -s /usr/bin/lld-5.0       /usr/bin/lld
+RUN add-apt-repository "deb http://deb.debian.org/debian buster-backports main" && \
+    apt-get update && apt-get install -t buster-backports -y -q \
+    curl
 
-RUN groupadd -r -g 1001 ghuser
-RUN useradd -r -u 1001 -g ghuser ghuser
-USER ghuser
+ENV SKIA_NINJA_COMMAND="/usr/bin/ninja"

arch/glibc/Dockerfile

@@ -3,16 +3,20 @@ FROM node:16-alpine
 ENV RUSTFLAGS="-C target-feature=-crt-static" \
     CC="clang" \
     CXX="clang++" \
-    GN_EXE=gn \
+    GN_EXE="gn" \
     SKIA_GN_COMMAND="/usr/bin/gn" \
     SKIA_NINJA_COMMAND="/usr/bin/ninja"
 
-RUN sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories
+RUN apk update && apk add --update --no-cache \
+    bash curl git python3 python2 perl clang llvm g++ build-base \
+    musl-dev openssl-dev fontconfig-dev fontconfig ttf-dejavu
+
 RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    bash curl git tar python3 python2 perl clang llvm make gn ninja \
-    musl-dev build-base fontconfig-dev openssl-dev g++ \
-    fontconfig ttf-dejavu
-RUN apk upgrade
+    gn ninja
+
+RUN export ASM="/usr/include/c++/10.3.1/aarch64-alpine-linux-musl/asm" && \
+    mkdir -p ${ASM} && \
+    touch ${ASM}/hwcap.h
 
 WORKDIR /code
-COPY alpine-build.patch .
+COPY alpine-build.patch .