ci: change oracle-aarch64-4cpu-16gb to longhorn-infra-arm64-runners

Signed-off-by: PoAn Yang <poan.yang@suse.com>
longhorn · May 15, 2024 · aaf8efd · aaf8efd
1 parent e263d54
commit aaf8efd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 30 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,13 +33,15 @@ jobs:
 
   build-arm64-binaries:
     name: Build ARM64 binaries
-    runs-on: oracle-aarch64-4cpu-16gb
+    runs-on: longhorn-infra-arm64-runners
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install make
-      run: sudo apt-get install make
+      run: |
+        sudo apt update
+        sudo apt-get -y install make curl
 
     # Build binaries
     - name: Run make ci
@@ -54,6 +56,7 @@ jobs:
   build-push-amd64-images:
     name: Build and push AMD64 images
     runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/tags/') }}
     needs: build-amd64-binaries
     steps:
     - name: Checkout code
@@ -83,23 +86,12 @@ jobs:
         cp -r ./bin ./package/
 
     - name: Login to Docker Hub
-      if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/tags/') }}
       uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     # longhornio/longhorn-instance-manager image
-    - name: docker-build-longhorn-instance-manager
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: false
-        platforms: linux/amd64
-        tags: longhornio/longhorn-instance-manager:${{ env.branch }}-head-amd64
-        file: package/Dockerfile
-        build-args: |
-          ARCH=amd64
     - name: docker-publish-longhorn-instance-manager
       if: ${{ startsWith(github.ref, 'refs/heads/') }}
       uses: docker/build-push-action@v5
@@ -125,14 +117,17 @@ jobs:
 
   build-push-arm64-images:
     name: Build and push ARM64 images
-    runs-on: oracle-aarch64-4cpu-16gb
+    runs-on: longhorn-infra-arm64-runners
+    if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/tags/') }}
     needs: build-arm64-binaries
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install make
-      run: sudo apt-get install make
+      run: |
+        sudo apt update
+        sudo apt-get -y install make curl
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
@@ -157,24 +152,12 @@ jobs:
         cp -r ./bin ./package/
 
     - name: Login to Docker Hub
-      if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/tags/') }}
       uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
     # longhornio/longhorn-instance-manager image
-    - name: docker-build-longhorn-instance-manager
-      if: ${{ startsWith(github.ref, 'refs/heads/') }}
-      uses: docker/build-push-action@v5
-      with:
-        context: .
-        push: false
-        platforms: linux/arm64
-        tags: longhornio/longhorn-instance-manager:${{ env.branch }}-head-arm64
-        file: package/Dockerfile
-        build-args: |
-          ARCH=arm64
     - name: docker-publish-longhorn-instance-manager
       if: ${{ startsWith(github.ref, 'refs/heads/') }}
       uses: docker/build-push-action@v5

diff --git a/scripts/build b/scripts/build
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 source $(dirname $0)/version
 

diff --git a/scripts/ci b/scripts/ci
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 cd $(dirname $0)
 

diff --git a/scripts/validate b/scripts/validate
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 cd $(dirname $0)/..
 

diff --git a/scripts/version b/scripts/version
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd $(dirname $0)/..
+
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
     DIRTY="-dirty"
 fi
@@ -16,3 +18,5 @@ fi
 GITCOMMIT=$(git rev-parse HEAD)
 BUILDDATE=$(date -u --rfc-3339=seconds)
 BUILDDATE=${BUILDDATE// /T}
+
+cd scripts