From 6adfef8265eac38cc2c2eed52c561634c4f648f9 Mon Sep 17 00:00:00 2001
From: Raphanus Lo <yunchang.lo@suse.com>
Date: Mon, 17 Feb 2025 14:51:59 +0800
Subject: [PATCH] fix(ci): fix binary dependency for local build

Signed-off-by: Raphanus Lo <yunchang.lo@suse.com>
---
 .github/workflows/build.yml | 8 --------
 package/Dockerfile          | 2 +-
 scripts/package             | 6 +++---
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88c8039f9..413d5cba3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -119,10 +119,6 @@ jobs:
       run: |
         chmod +x ./bin/*
 
-    - name: Copy bin folder to package
-      run: |
-        cp -r ./bin ./package/
-
     - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
@@ -166,10 +162,6 @@ jobs:
       run: |
         chmod +x ./bin/*
 
-    - name: Copy bin folder to package
-      run: |
-        cp -r ./bin ./package/
-
     - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
diff --git a/package/Dockerfile b/package/Dockerfile
index 2bbbe9d46..b00771d13 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -140,7 +140,7 @@ COPY --from=cbuilder \
 
 RUN ldconfig
 
-COPY package/bin/longhorn-instance-manager /usr/local/bin/
+COPY bin/longhorn-instance-manager /usr/local/bin/
 COPY package/instance-manager /usr/local/bin/
 COPY package/instance-manager-v2-prestop /usr/local/bin/
 
diff --git a/scripts/package b/scripts/package
index 893ae4e3b..ae2ce5f4a 100755
--- a/scripts/package
+++ b/scripts/package
@@ -22,6 +22,9 @@ IID_FILE_FLAG=${IID_FILE_FLAG:-''}
 SRC_BRANCH=${SRC_BRANCH:-''}
 SRC_TAG=${SRC_TAG:-''}
 
+# TODO: implement self-contained build
+[[ ! -x ./bin/longhorn-instance-manager ]] && ./scripts/build
+
 if [[ -z $TAG ]]; then
     if API_VERSION=$(./bin/longhorn-instance-manager version --client-only | jq ".clientVersion.instanceManagerAPIVersion"); then
       TAG="v${API_VERSION}_$(date -u +%Y%m%d)"
@@ -59,9 +62,6 @@ else
     x86_64)
         ARCH=amd64
         ;;
-    s390x)
-        ARCH=s390x
-        ;;
     *)
         echo "$(uname -a): unsupported architecture"
         exit 1