revert: "fix: Add arm64 build and release (runfinch#99)" (runfinch#105)

austinvazquez · web-flow · commit fb0dc0fa6a4a · 2024-11-26T16:22:22.000-08:00
This reverts commit 9cc615a. Signed-off-by: Austin Vazquez <macedonv@amazon.com>
diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml
@@ -22,16 +22,12 @@ jobs:
         uses: "WyriHaximus/github-action-get-previous-tag@04e8485ecb6487243907e330d522ff60f02283ce" # v1.4.0
   generate-artifacts:
     needs: get-latest-tag
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
-        arch: [amd64, arm64]
+    runs-on: ubuntu-20.04
     env:
+      # Set during setup.
       RELEASE_TAG: ${{ needs.get-latest-tag.outputs.tag }}
       DYNAMIC_BINARY_NAME: ''
       STATIC_BINARY_NAME: ''
-      RELEASE_VERSION: ''
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -46,104 +42,68 @@ jobs:
         run: |
           export release_tag=${{ env.RELEASE_TAG }}
           export release_version=${release_tag/v/} # Remove v from tag name
-          echo "DYNAMIC_BINARY_NAME=finch-daemon-${release_version}-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
-          echo "STATIC_BINARY_NAME=finch-daemon-${release_version}-linux-${{ matrix.arch }}-static.tar.gz" >> $GITHUB_ENV
-          echo "RELEASE_VERSION=${release_version}" >> $GITHUB_ENV
+          echo "DYNAMIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64.tar.gz" >> $GITHUB_ENV
+          echo "STATIC_BINARY_NAME=finch-daemon-${release_version}-linux-amd64-static.tar.gz" >> $GITHUB_ENV
+
           mkdir release
       - name: Install Go licenses
         run: go install github.com/google/go-licenses@latest
-      - name: Install Cross Arch dependencies
-        run: |
-          if [ "${{ matrix.arch }}" = "arm64" ]; then
-            sudo apt update
-            sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-          fi
       - name: Create Third Party Licences File
         run: make licenses
-      - name: setup static dependencies
+      - name: setup static dependecies
         run: |
           sudo apt-get update
           sudo apt-get install libc6-dev -f
       - name: Create release binaries
-        run: |
-          if [ "${{ matrix.arch }}" = "amd64" ]; then
-              make TARGET_ARCH=${{ matrix.arch }} RELEASE_TAG=${{ env.RELEASE_TAG }} release
-          elif [ "${{ matrix.arch }}" = "arm64" ]; then
-              make CC=aarch64-linux-gnu-gcc TARGET_ARCH=${{ matrix.arch }} RELEASE_TAG=${{ env.RELEASE_TAG }} release
-          fi
+        run: make RELEASE_TAG=${{ env.RELEASE_TAG }} release
       - name: Verify Release version
         run: |
-            export HOST_ARCH=''
-            case $(uname -m) in
-                x86_64) HOST_ARCH="amd64" ;;
-                aarch64) HOST_ARCH="arm64" ;;
-                *) echo "Error: Unsupported arch $(uname -m)"; exit 1 ;;
-            esac
-            echo "Host Arch: $HOST_ARCH"
-            if [ "${{ matrix.arch }}" = "$HOST_ARCH" ]; then
-              mkdir -p output/static output/dynamic
-              tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output/dynamic
-              tar -xzf release/${{ env.STATIC_BINARY_NAME }} -C ./output/static
-              DYNAMIC_BINARY_VERSION=$(./output/dynamic/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
-              STATIC_BINARY_VERSION=$(./output/static/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
-              export release_tag=${{ env.RELEASE_TAG }}
-              export release_version=${release_tag/v/}
-              echo "Dynamic version $DYNAMIC_BINARY_VERSION"
-            else
-              echo "Architecture mismatch: Cross Arch validation is not supported. Skipping version verification"
-            fi
+          mkdir -p output/static output/dynamic
+          tar -xzf release/${{ env.DYNAMIC_BINARY_NAME }} -C ./output/dynamic
+          tar -xzf release/${{ env.STATIC_BINARY_NAME }} -C ./output/static
+          DYNAMIC_BINARY_VERSION=$(./output/dynamic/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
+          STATIC_BINARY_VERSION=$(./output/static/finch-daemon --version | grep -oP '\d+\.\d+\.\d+')
+          export release_tag=${{ env.RELEASE_TAG }}
+          export release_version=${release_tag/v/}
+          if ["$STATIC_BINARY_VERSION" != "$release_version"] || ["$DYNAMIC_BINARY_VERSION" != "$release_version"]; then
+            echo "Version mismatch"
+            exit 1
+          fi
         shell: bash
       - uses: actions/upload-artifact@v4
         with:
-          name: artifacts-${{ matrix.arch }}
+          name: artifacts
           path: release/
           if-no-files-found: error
     outputs:
       release_tag: ${{ env.RELEASE_TAG }}
-      release_version: ${{ env.RELEASE_VERSION }}
       dynamic_binary_name: ${{ env.DYNAMIC_BINARY_NAME }}
       static_binary_name: ${{ env.STATIC_BINARY_NAME }}
-
   validate-artifacts:
     needs: generate-artifacts
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        arch: [amd64, arm64]
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
-          name: artifacts-${{ matrix.arch }}
+          name: artifacts
           path: release/
       - run: bash scripts/verify-release-artifacts.sh ${{ needs.generate-artifacts.outputs.release_tag }}
-        env:
-          TARGET_ARCH: ${{ matrix.arch }}
   create-release:
     needs: [generate-artifacts, validate-artifacts]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Download Artifact amd64
-        uses: actions/download-artifact@v4
-        with:
-          name: artifacts-amd64
-      - name: Download Artifact arm64
-        uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: artifacts-arm64
+          name: artifacts
       - uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ needs.generate-artifacts.outputs.release_tag }}
           prerelease: false
           generate_release_notes: false
           files: |
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-amd64.tar.gz
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-amd64.tar.gz.sha256sum
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-amd64-static.tar.gz
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-amd64-static.tar.gz.sha256sum
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-arm64.tar.gz
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-arm64.tar.gz.sha256sum
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-arm64-static.tar.gz
-            finch-daemon-${{ needs.generate-artifacts.outputs.release_version }}-linux-arm64-static.tar.gz.sha256sum
+            ${{ needs.generate-artifacts.outputs.dynamic_binary_name }}
+            ${{ needs.generate-artifacts.outputs.dynamic_binary_name }}.sha256sum
+            ${{ needs.generate-artifacts.outputs.static_binary_name }}
+            ${{ needs.generate-artifacts.outputs.static_binary_name }}.sha256sum
diff --git a/scripts/create-releases.sh b/scripts/create-releases.sh
@@ -29,22 +29,15 @@ RELEASE_DIR="${FINCH_DAEMON_PROJECT_ROOT}/release"
 LICENSE_FILE=${FINCH_DAEMON_PROJECT_ROOT}/THIRD_PARTY_LICENSES
 TAG_REGEX="v[0-9]+.[0-9]+.[0-9]+"
 
-ARCH="${TARGET_ARCH:-}"
-
-if [ -z "$ARCH" ]; then
-    case $(uname -m) in
-        x86_64) ARCH="amd64" ;;
-        aarch64) ARCH="arm64" ;;
-        *) echo "Error: Unsupported arch $(uname -m)"; exit 1 ;;
-    esac
-fi
-
-echo "Using ARCH: $ARCH"
-
-if [ "$#" -lt 1 ]; then
-    echo "Expected 1 parameter (release_tag), got $#."
-    echo "Usage: $0 [architecture] [release_tag]"
-    echo "Supported architectures: amd64, arm64"
+ARCH=""
+case $(uname -m) in
+    x86_64) ARCH="amd64" ;;
+    *) echo "Error: Unsupported arch"; exit 1 ;;
+esac
+
+if [ "$#" -ne 1 ]; then
+    echo "Expected 1 parameter, got $#."
+    echo "Usage: $0 [release_tag]"
     exit 1
 fi
 
@@ -53,34 +46,30 @@ if ! [[ "$1" =~ $TAG_REGEX ]]; then
     exit 1
 fi
 
-release_version=${1/v/} # Remove v from tag name
-shift # Remove the release version argument
-
 if [ -d "$RELEASE_DIR" ]; then
     rm -rf "${RELEASE_DIR:?}"/*
 else
     mkdir "$RELEASE_DIR"
 fi
 
+release_version=${1/v/} # Remove v from tag name
 dynamic_binary_name=finch-daemon-${release_version}-linux-${ARCH}.tar.gz
 static_binary_name=finch-daemon-${release_version}-linux-${ARCH}-static.tar.gz
 
-# Build for the selected architecture
-GOARCH=$ARCH  make build
+make build
 cp "$LICENSE_FILE" "${OUT_DIR}"
 pushd "$OUT_DIR"
 tar -czvf "$RELEASE_DIR"/"$dynamic_binary_name" -- *
 popd
 rm -rf "{$OUT_DIR:?}"/*
 
-STATIC=1 GOARCH=$ARCH make build
+STATIC=1 make build
 cp "$LICENSE_FILE" "${OUT_DIR}"
 pushd "$OUT_DIR"
 tar -czvf "$RELEASE_DIR"/"$static_binary_name" -- *
 popd
 rm -rf "{$OUT_DIR:?}"/*
 
-# Create checksums
 pushd "$RELEASE_DIR"
 sha256sum "$dynamic_binary_name" > "$RELEASE_DIR"/"$dynamic_binary_name".sha256sum
 sha256sum "$static_binary_name" > "$RELEASE_DIR"/"$static_binary_name".sha256sum
diff --git a/scripts/verify-release-artifacts.sh b/scripts/verify-release-artifacts.sh
@@ -22,14 +22,7 @@ cur_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 dinch_daemon_project_root="$(cd -- "$cur_dir"/.. && pwd)"
 release_dir="${dinch_daemon_project_root}/release"
 
-arch="${TARGET_ARCH:-}"
-if [ -z "$arch" ]; then
-    case $(uname -m) in
-        x86_64) arch="amd64" ;;
-        aarch64) arch="arm64" ;;
-        *) echo "Error: Unsupported arch $(uname -m)"; exit 1 ;;
-    esac
-fi
+arch="amd64"
 
 function usage {
     echo "Usage: $0 <release_tag>"
