feat: electron building steps

Author: darkyzhou

.github/workflows/builder.yaml

@@ -11,7 +11,7 @@ on:
       hostRustVersion:
         type: string
         required: true
-        default: "18.2.0"
+        default: "1.82.0"
         description: Host rustc version
       targetRustBranch:
         type: string
@@ -44,13 +44,13 @@ jobs:
           file: Dockerfile.libgcc
           build-args: |
             GCC_VERSION=${{ inputs.gccVersion }}
-      - name: Extract libgcc artifact
+      - name: Extract libgcc Artifact
         uses: shrink/actions-docker-extract@v3
         with:
           image: libgcc:latest
           path: /root/build/libgcc.tar.gz
           destination: dist
-      - name: Upload artifact
+      - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: libgcc
@@ -72,14 +72,14 @@ jobs:
             RUSTUP_VERSION=${{ inputs.rustupVersion }}
             HOST_RUST_VERSION=${{ inputs.hostRustVersion }}
             TARGET_RUST_BRANCH=${{ inputs.targetRustBranch }}
-      - name: Extract artifact
+      - name: Extract Artifact
         uses: shrink/actions-docker-extract@v3
         id: extract
         with:
           image: rustc:latest
           path: /root/rust/rustc.tar.gz
           destination: dist
-      - name: Upload artifact
+      - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: rustc
@@ -92,12 +92,26 @@ jobs:
     runs-on: self-hosted
     container:
       image: ghcr.io/darkyzhou/electron-build-runner:latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Download artifacts
+      - name: Download Artifacts
         uses: actions/download-artifact@v4
-      - name: Build and push builder image
+        with:
+          path: .
+          merge-multiple: true
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and Push Builder Image
         uses: docker/build-push-action@v6
         with:
-          tags: darkyzhou/electron-loong64-builder:${{ inputs.imageTag }}
+          push: true
+          context: .
           file: Dockerfile.builder
+          tags: ghcr.io/darkyzhou/electron-builder:${{ inputs.imageTag }}

.github/workflows/electron.yaml

@@ -3,62 +3,87 @@ name: Build Electron
 on:
   workflow_dispatch:
     inputs:
-      electronBranch:
+      builderImageTag:
         type: string
         required: true
-        default: "v32.2.5"
-        description: Branch of electron to build
+        default: "electron-v32"
+        description: Builder image tag
+      electronVersion:
+        type: string
+        required: true
+        default: "32.2.5"
+        description: Version of electron to build
 
 jobs:
-  prepare-src:
+  prepare:
     runs-on: self-hosted
     container:
       image: ghcr.io/darkyzhou/electron-buildtools:latest
       volumes:
-        - /home/darkyzhou/data/build/electron-loong64:/home/builduser/buildroot
+        - /home/darkyzhou/data/build/electron-loong64:/home/builduser
     steps:
       - uses: actions/checkout@v4
-        with:
-          path: repo
-      - name: Sync sources
+      - name: Patch Sources
         run: |
           set -ex
+          export REPO_PATH=`pwd`
           cd /home/builduser/buildroot
           if [ ! -d "src/electron" ]; then
             npx e init -i release -r /home/builduser/buildroot electron-loong64
-            git clone -b ${{ inputs.electronBranch }} https://github.com/electron/electron src/electron
+            git clone https://github.com/electron/electron.git src/electron
           fi
           git -C src clean -fd || true
           git -C src am --abort || true
+          git -C src/electron clean -fd
+          git -C src/electron reset --hard HEAD
           git -C src/electron fetch origin --tags
-          git -C src/electron switch --detach ${{ inputs.electronBranch }}
-          git -C src/electron apply repo/electron.patch
-          npx e sync -vvvv
+          git -C src/electron switch --detach v${{ inputs.electronVersion }}
+          git -C src/electron apply $REPO_PATH/electron.patch
+      - name: Sync Dependencies
+        run: |
+          set -ex
+          cd /home/builduser/buildroot
+          rm -rf src/build/linux/debian_bullseye*
+          npx e sync
   build:
-    needs: prepare-src
+    needs: prepare
     runs-on: self-hosted
+    permissions:
+      contents: read
+      packages: write
     container:
-      image: ghcr.io/darkyzhou/electron-builder:latest
+      image: ghcr.io/darkyzhou/electron-builder:${{ inputs.builderImageTag }}
       volumes:
-        - /home/darkyzhou/data/build/electron-loong64:/home/builduser/buildroot
+        - /home/darkyzhou/data/build/electron-loong64:/home/builduser
     steps:
-      - name: Replace binaries
+      - name: Replace Binaries
         run: |
           set -ex
-          cp /usr/local/lib/node_modules/@esbuild/linux-loong64/bin/esbuild /home/builduser/buildroot/src/third_party/devtools-frontend/src/third_party/esbuild/esbuild
           cp /usr/local/bin/node /home/builduser/buildroot/src/third_party/node/linux/node-linux-x64/bin/node
-      - name: Generate ninja
+          chmod +w /home/builduser/buildroot/src/third_party/devtools-frontend/src/third_party/esbuild/esbuild
+          cp /usr/local/lib/node_modules/@esbuild/linux-loong64/bin/esbuild /home/builduser/buildroot/src/third_party/devtools-frontend/src/third_party/esbuild/esbuild
+      - name: Build Electron
         run: |
           set -ex
           cd /home/builduser/buildroot/src
           gn gen out/Release --args="import(\"//electron/build/args/release.gn\")" --script-executable=/usr/bin/python3
+          ninja -C out/Release/ electron
         env:
           CC: clang
           CXX: clang++
           AR: ar
           NM: nm
           RUSTC_BOOTSTRAP: 1
-      - name: Build electron
+      - name: Package Electron
         run: |
           set -ex
           cd /home/builduser/buildroot/src
+          ninja -C out/Release/ electron:electron_dist_zip
+      - name: Upload Artifact
+        uses: svenstaro/upload-release-action@v2
+        with:
+          file: /home/builduser/buildroot/src/out/Release/dist.zip
+          asset_name: electron-v${{ inputs.electronVersion }}-linux-loong64.zip
+          release_name: Electron v${{ inputs.electronVersion }} port for LoongArch64
+          overwrite: true
+          tag: v${{ inputs.electronVersion }}

Dockerfile.builder

@@ -36,6 +36,8 @@ RUN apt-get update && \
         clang \
         llvm \
         llvm-dev \
+        generate-ninja \
+        ninja-build \
         lld \
         libclang-dev \
         libclang-rt-dev \
@@ -175,25 +177,23 @@ RUN apt-get update && \
         xcb \
         libdav1d-dev \
         libyuv-dev \
-
-        generate-ninja \
-        ninja-build
+        mesa-common-dev
 
 RUN curl -L -O https://unofficial-builds.nodejs.org/download/release/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-loong64.tar.gz && \
     tar -xzf node-v${NODE_VERSION}-linux-loong64.tar.gz && \
     cp -R node-v${NODE_VERSION}-linux-loong64/* /usr/local/ && \
     rm -rf node-v${NODE_VERSION}-linux-loong64* && \
     npm i -g yarn @esbuild/linux-loong64@0.14.54
 
-ADD libgcc rustc .
+COPY libgcc.tar.gz rustc.tar.gz .
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN mkdir libgcc && \
-    tar -xzvf libgcc -C libgcc && \
+    tar -xzvf libgcc.tar.gz -C libgcc && \
     # Replacing the crtbeginS.o is hacky, we might need to build the whole gcc instead
-    mv libgcc/gcc/loongarch64-unknown-linux-gnu/*/crtbeginS.o /usr/lib/gcc/loongarch64-linux-gnu/*/ && \
-    rm -rf libgcc && \
-    tar -xzvf rustc -C /usr && \
-    cargo install bindgen-cli@0.69.1 --root /usr
+    cp libgcc/gcc/loongarch64-unknown-linux-gnu/*/crtbeginS.o /usr/lib/gcc/loongarch64-linux-gnu/*/ && \
+    tar -xzvf rustc.tar.gz -C /usr && \
+    # Chromium seems to require that bindgen binary lives together with llvm
+    cargo install bindgen-cli@0.69.1 --root /usr/lib/llvm-19
 
 RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser && \
     echo 'Defaults    env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep

Dockerfile.buildtools

@@ -9,8 +9,8 @@ RUN apt-get update && \
         ca-certificates \
         curl \
         git \
+        sudo \
         xz-utils \
-        sudo
 
 RUN curl --silent --location https://deb.nodesource.com/setup_20.x | bash - && \
     apt-get update && \

Dockerfile.rustc

@@ -10,6 +10,7 @@ RUN apt-get update && \
         ca-certificates \
         curl \
         git \
+        cmake \
         python3 \
         ninja-build \
         libffi-dev \

config.toml

@@ -6,8 +6,8 @@ python = "/usr/bin/python3"
 extended = true
 tools = [ "cargo" ]
 verbose = 1
-sanitizers = false
-profiler = false
+sanitizers = true
+profiler = true
 docs = false
 print-step-timings = true