ci: add support for linux-arm64 build

.github/workflows/make-plugin-linux.yml

@@ -11,22 +11,72 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [amd64, arm64]
+        include:
+          - arch: amd64
+            archstring: x86_64
+          - arch: arm64
+            archstring: arm64
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+      with:
+        install: true
+
+    - name: Set up QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v2
+
+    # Temporary fix for https://github.com/bazelbuild/bazel/issues/11379
+    - name: Reset QEMU 
+      run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-${{ matrix.arch }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.arch }}-buildx-
+
     - name: Build plugin docker image
-      run: docker-compose build prereqs protoc-plugin
+      run: |
+        docker buildx bake -f release.hcl release \
+          --set *.platform=linux/${{ matrix.arch }} \
+          --set *.cache-from=type=local,src=/tmp/.buildx-cache \
+          --set *.cache-to=type=local,mode=max,dest=/tmp/.buildx-cache-new \
+          --load
+
+    - name: Setup tmate session
+      if: ${{ failure() }}
+      uses: mxschmitt/action-tmate@v3
+
     - name: Copy binary from Docker image
       run: |
-        docker cp $(docker create grpcweb/protoc-plugin):/github/grpc-web/javascript/net/grpc/web/generator/protoc-gen-grpc-web \
-          ./protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-x86_64
+        docker cp $(docker create --platform linux/${{ matrix.arch }} grpcweb/protoc-plugin):/github/grpc-web/javascript/net/grpc/web/generator/protoc-gen-grpc-web \
+          ./protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-${{ matrix.archstring }}
+
     - name: gen sha256
       run: |
-        openssl dgst -sha256 -r -out protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-x86_64.sha256 \
-          protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-x86_64
-    - name: verify sha256
-      run: sha256sum -c protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-x86_64.sha256
+        openssl dgst -sha256 -r -out protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-${{ matrix.archstring }}.sha256 \
+          protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-${{ matrix.archstring }}
+
+    - name: verify sha256 x86_64
+      run: sha256sum -c protoc-gen-grpc-web-${{ github.event.inputs.version_number }}-linux-${{ matrix.archstring }}.sha256
+
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:
         name: plugin
         path: protoc-gen-grpc-web*
+
+
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache

net/grpc/gateway/docker/prereqs/Dockerfile

@@ -19,22 +19,24 @@
 # Stage 1: Fetch binaries
 ######################################
 # node:... Docker image is based on buildpack-deps:stretch
-FROM buildpack-deps:stretch AS prepare
+FROM buildpack-deps:bullseye AS prepare
 
-ARG BUILDIFIER_VERSION=1.0.0
+ARG BUILDIFIER_VERSION=5.1.0
 ARG PROTOBUF_VERSION=3.19.4
+ARG TARGETARCH
 
 RUN apt-get -qq update && apt-get -qq install -y curl unzip
 
 WORKDIR /tmp
 
-RUN curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/\
-protoc-$PROTOBUF_VERSION-linux-x86_64.zip -o protoc.zip && \
+RUN case $TARGETARCH in arm64) arch="aarch_64"; ;; amd64) arch="x86_64"; ;; *) echo "ERROR: Machine type $TARGETARCH not supported."; ;; esac && \
+curl -sSL https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/\
+protoc-$PROTOBUF_VERSION-linux-$arch.zip -o protoc.zip && \
   unzip -qq protoc.zip && \
   cp ./bin/protoc /usr/local/bin/protoc
 
 RUN wget -nv -O buildifier \
-  https://github.com/bazelbuild/buildtools/releases/download/$BUILDIFIER_VERSION/buildifier && \
+  https://github.com/bazelbuild/buildtools/releases/download/$BUILDIFIER_VERSION/buildifier-linux-$TARGETARCH && \
   chmod +x ./buildifier && \
   cp ./buildifier /usr/local/bin/buildifier
 
@@ -49,10 +51,11 @@ RUN ./scripts/init_submodules.sh
 ######################################
 # Stage 2: Copy source files and build
 ######################################
-FROM node:12.22.6-stretch AS copy-and-build
+FROM node:16-bullseye AS copy-and-build
 
 ARG MAKEFLAGS=-j8
-ARG BAZEL_VERSION=4.1.0
+ARG BAZELISK_VERSION=1.11.0
+ARG TARGETARCH
 
 RUN mkdir -p /var/www/html/dist
 RUN echo "\nloglevel=error\n" >> $HOME/.npmrc
@@ -61,12 +64,10 @@ COPY --from=prepare /usr/local/bin/protoc /usr/local/bin/
 COPY --from=prepare /usr/local/bin/buildifier /usr/local/bin/
 COPY --from=prepare /github/grpc-web/third_party /github/grpc-web/third_party
 
-RUN wget -nv -O bazel-installer.sh \
-  https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/\
-bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
-  chmod +x ./bazel-installer.sh && \
-  ./bazel-installer.sh && \
-  rm ./bazel-installer.sh
+RUN wget -nv -O /usr/local/bin/bazelisk \
+  https://github.com/bazelbuild/bazelisk/releases/download/v$BAZELISK_VERSION/bazelisk-linux-$TARGETARCH && \
+  chmod +x /usr/local/bin/bazelisk && \
+  bazelisk
 
 WORKDIR /github/grpc-web
 
@@ -75,8 +76,8 @@ WORKDIR /github/grpc-web
 COPY ./WORKSPACE ./WORKSPACE
 COPY ./javascript/net/grpc/web/generator javascript/net/grpc/web/generator
 
-RUN bazel build javascript/net/grpc/web/generator:protoc-gen-grpc-web && \
-  cp $(bazel info bazel-genfiles)/javascript/net/grpc/web/generator/protoc-gen-grpc-web \
+RUN bazelisk build javascript/net/grpc/web/generator:protoc-gen-grpc-web && \
+  cp $(bazelisk info bazel-genfiles)/javascript/net/grpc/web/generator/protoc-gen-grpc-web \
   /usr/local/bin/protoc-gen-grpc-web
 
 COPY ./javascript ./javascript

packages/grpc-web/package.json

@@ -27,10 +27,10 @@
   "devDependencies": {
     "@types/google-protobuf": "~3.7.0",
     "command-exists": "~1.2.8",
-    "google-closure-compiler": "~20200224.0.0",
-    "google-closure-deps": "~20210601.0.0",
-    "google-closure-library": "~20210808.0.0",
-    "google-protobuf": "~3.14.0",
+    "google-closure-compiler": "^20220301.0.0",
+    "google-closure-deps": "^20220202.0.0",
+    "google-closure-library": "^20220202.0.0",
+    "google-protobuf": "~3.19.4",
     "gulp": "~4.0.2",
     "gulp-connect": "~5.7.0",
     "gulp-eval": "~1.0.0",

release.hcl

@@ -0,0 +1,15 @@
+group "release" {
+    targets = ["prereqs", "protoc-plugin"]
+}
+
+target "prereqs" {
+    dockerfile = "./net/grpc/gateway/docker/prereqs/Dockerfile"
+}
+
+target "protoc-plugin" {
+    dockerfile = "./net/grpc/gateway/docker/protoc_plugin/Dockerfile"
+    tags = ["docker.io/grpcweb/protoc-plugin"]
+    contexts = {
+        "grpcweb/prereqs" = "target:prereqs"
+    }
+}