fix(ci): fix binary dependency for local build

Signed-off-by: Raphanus Lo <[email protected]>
longhorn · Feb 17, 2025 · 6adfef8 · 6adfef8
1 parent 5de8211
commit 6adfef8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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