From cd5de716f098d3f19b008c72791f88d43904ae47 Mon Sep 17 00:00:00 2001
From: Daniel Jones <djones@polygon.technology>
Date: Fri, 18 Oct 2024 09:54:16 -0500
Subject: [PATCH] Adding fixes for potential heimdalld packages and fixes to CI

---
 .github/workflows/ci.yml | 36 +++++++++++++-----------------------
 heimdall.sh              |  5 +++--
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e3a1b6..4967697 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,6 @@
 name: CI
 
+
 on:
   push:
     branches: ["main"]
@@ -10,19 +11,18 @@ on:
 jobs:
   install_aarch64:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     name: Install on ${{ matrix.distro }} ${{ matrix.arch }}
     strategy:
       matrix:
         include:
           - arch: aarch64
             distro: ubuntu_latest
-          - arch: aarch64
-            distro: alpine_latest
-          - arch: aarch64
-            distro: fedora_latest
+            base_image: latest
+            platform: linux/amd64,linux/arm64
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: uraimo/run-on-arch-action@v2
         name: Install binary
         with:
@@ -31,17 +31,9 @@ jobs:
 
           install: |
             case "${{ matrix.distro }}" in
-              ubuntu*|jessie|stretch|buster|bullseye)
+              ubuntu*|ubuntu22.04)
                 apt-get update -q -y
-                apt-get install -q -y wget sudo bash
-                ;;
-              fedora*)
-                dnf -y update
-                dnf -y install wget sudo bash
-                ;;
-              alpine*)
-                apk update
-                apk add wget sudo bash
+                apt-get install -q -y wget sudo bash adduser systemctl
                 ;;
             esac
 
@@ -50,21 +42,19 @@ jobs:
             --volume "${PWD}:/artifacts"
 
           run: |
-            bash /artifacts/bor.sh
-            bash /artifacts/bor.sh 0.2.17
-            bash /artifacts/heimdall.sh
-            bash /artifacts/heimdall.sh 0.2.11
+            bash /artifacts/bor.sh v1.4.0 amoy sentry
+            bash /artifacts/heimdall.sh v1.0.10 amoy sentry
 
   install_amd64:
     runs-on: ${{ matrix.os }}
     name: Install on ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install binary
         run: |
-          ./bor.sh 0.2.17
-          ./heimdall.sh 0.2.11
\ No newline at end of file
+          ./bor.sh v1.4.0 amoy sentry
+          ./heimdall.sh v1.0.10 amoy sentry
\ No newline at end of file
diff --git a/heimdall.sh b/heimdall.sh
index 0338eb8..329c78e 100755
--- a/heimdall.sh
+++ b/heimdall.sh
@@ -22,8 +22,8 @@ require_util() {
         oops "you do not have '$1' installed, which I need to $2"
 }
 
-version="0.3.0"
-newCLIVersion="0.3.0"
+version="1.0.10"
+newCLIVersion="1.0.10"
 network="mainnet"
 nodetype="sentry"
 
@@ -209,6 +209,7 @@ if [ $type = "tar.gz" ]; then
 elif [ $type = "deb" ]; then
     echo "Uninstalling any existing old binary ..."
     sudo dpkg -r heimdall
+    sudo dpkg -r heimdalld
     echo "Installing $package ..."
     sudo dpkg -i $package
     if [ ! -z "$profilePackage" ] && sudo [ ! -d /var/lib/heimdall/config ]; then