Add ARM release artifacts (#593)

This change modifies the release process to produce artifacts suffixed by
the build architecture (amd64, arm, arm64).

Signed-off-by: Ali Ariff <[email protected]>

Author: aliariff

.github/actions/package/Dockerfile

@@ -3,7 +3,13 @@ FROM $BASE_IMAGE
 WORKDIR /linkerd
 RUN apt-get update && \
     apt-get install -y jq && \
+    apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross && \
+    rustup target add aarch64-unknown-linux-gnu && \
+    apt-get install -y --no-install-recommends g++-arm-linux-gnueabihf libc6-dev-armhf-cross && \
+    rustup target add armv7-unknown-linux-gnueabihf && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/
+ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
 # v2.1.0
 ARG CHECKSEC_SHA=04582bad41589ad479ca8b1f0170ed317475b5a5
 RUN cd /usr/local/bin && curl -vsLO "https://raw.githubusercontent.com/slimm609/checksec.sh/$CHECKSEC_SHA/checksec" && chmod 755 checksec

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: release
+name: Release
 
 on:
   push:
@@ -7,6 +7,20 @@ on:
 
 jobs:
   package:
+    strategy:
+      matrix:
+        architecture: [amd64, arm64, arm]
+        include:
+          - architecture: amd64
+            target: x86_64-unknown-linux-gnu
+            strip: strip
+          - architecture: arm64
+            target: aarch64-unknown-linux-gnu
+            strip: aarch64-linux-gnu-strip
+          - architecture: arm
+            target: armv7-unknown-linux-gnueabihf
+            strip: arm-linux-gnueabihf-strip
+    name: Package (${{ matrix.architecture }})
     runs-on: ubuntu-latest
     steps:
       - name: git co
@@ -23,6 +37,9 @@ jobs:
         env:
           CARGO_RELEASE: "1"
           PACKAGE_VERSION: ${{ steps.release-tag-meta.outputs.name }}
+          CARGO_TARGET: ${{ matrix.target }}
+          STRIP: ${{ matrix.strip }}
+          ARCH: ${{ matrix.architecture }}
         uses: ./.github/actions/package
         with:
           entrypoint: make
@@ -32,12 +49,40 @@ jobs:
         uses: ./.github/actions/package
         with:
           entrypoint: /linkerd/validate-checksec.sh
-          args: /linkerd/expected-checksec.json "target/x86_64-unknown-linux-gnu/release/package/linkerd2-proxy-${{ steps.release-tag-meta.outputs.name }}-checksec.json"
+          args: /linkerd/expected-checksec.json "target/${{ matrix.target }}/release/package/linkerd2-proxy-${{ steps.release-tag-meta.outputs.name }}-${{ matrix.architecture }}-checksec.json"
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.architecture }}-artifacts
+          path: target/${{ matrix.target }}/release/package/*
+
+  release:
+    needs: [package]
+    name: GitHub Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: git co
+        uses: actions/checkout@v1
+
+      - name: meta
+        id: release-tag-meta
+        uses: ./.github/actions/release-tag-meta
+        with:
+          git-ref: ${{ github.ref }}
+
+      - name: download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+
+      - name: display structure of downloaded files
+        run: ls -R artifacts
 
       - name: release
         uses: softprops/action-gh-release@b21b43d
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           name: ${{ steps.release-tag-meta.outputs.name }}
-          files:  target/x86_64-unknown-linux-gnu/release/package/*
+          files: artifacts/**/*

Makefile

@@ -9,11 +9,12 @@ ifndef PACKAGE_VERSION
 	PACKAGE_VERSION = $(shell git rev-parse --short HEAD)
 endif
 
+ARCH ?= amd64
 STRIP ?= strip
 PROFILING = profiling
 TARGET_BIN = $(TARGET)/linkerd2-proxy
 PKG_ROOT = $(TARGET)/package
-PKG_NAME = linkerd2-proxy-$(PACKAGE_VERSION)
+PKG_NAME = linkerd2-proxy-$(PACKAGE_VERSION)-$(ARCH)
 PKG_BASE = $(PKG_ROOT)/$(PKG_NAME)
 PKG_CHECKSEC = $(PKG_BASE)-checksec.json
 PKG = $(PKG_NAME).tar.gz
@@ -59,8 +60,8 @@ endif
 	./checksec.sh $(PKG_BASE)/bin/linkerd2-proxy >$(PKG_CHECKSEC) || true
 	cd $(PKG_ROOT) && \
 		tar -czvf $(PKG) $(PKG_NAME) && \
-		($(SHASUM) $(PKG) >$(PKG_NAME).txt) && \
-		rm -rf $(PKG_BASE)
+		($(SHASUM) $(PKG) >$(PKG_NAME).txt)
+	rm -rf $(PKG_BASE)
 
 
 .PHONY: fetch