Fix wrong gitVersion info and github action failed on arm (#211)

* Fix some minor bugs Signed-off-by: Cwen Yin <[email protected]> * add some comments Signed-off-by: Cwen Yin <[email protected]> Signed-off-by: Cwen Yin <[email protected]>
chaos-mesh · Aug 17, 2022 · 8f5b737 · 8f5b737
1 parent 25e098e
commit 8f5b737
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/release_latest.yml b/.github/workflows/release_latest.yml
@@ -24,13 +24,10 @@ jobs:
       - name: Prepare build environment
         run: |
           # actions/checkout require git v2.X
-          if [ "${{ matrix.arch }}" == "amd64" ]; then
-            yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
-          fi
-          yum install -y gcc
-          yum install -y make
-          yum install -y binutils
-          yum install -y git
+          yum install -y gcc make binutils centos-release-scl
+          yum install -y rh-git227-git
+          echo /opt/rh/rh-git227/root/usr/bin >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
       - uses: actions/checkout@master
         with:

diff --git a/.github/workflows/release_tag.yml b/.github/workflows/release_tag.yml
@@ -6,9 +6,13 @@ on:
 jobs:
   run:
     name: Upload
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [amd64, arm64]
+    runs-on: ${{ fromJson('{"amd64":"ubuntu-latest", "arm64":["self-hosted", "Linux", "ARM64"]}')[matrix.arch] }}
     # glibc version 2.17
-    container: docker.io/centos:7.2.1511
+    container: ${{ fromJson('{"amd64":"docker.io/centos:7.2.1511", "arm64":"docker.io/centos:centos7"}')[matrix.arch] }}
     steps:
       - name: Set up Go 1.18
         uses: actions/setup-go@v1
@@ -19,11 +23,10 @@ jobs:
       - name: Prepare build environment
         run: |
           # actions/checkout require git v2.X
-          yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm
-          yum install -y gcc
-          yum install -y make
-          yum install -y binutils
-          yum install -y git
+          yum install -y gcc make binutils centos-release-scl
+          yum install -y rh-git227-git
+          echo /opt/rh/rh-git227/root/usr/bin >> $GITHUB_PATH
+          echo "LD_LIBRARY_PATH=/opt/rh/httpd24/root/usr/lib64:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
       - uses: actions/checkout@master
         with:
@@ -45,6 +48,6 @@ jobs:
       - name: Upload files
         run: |
           GIT_TAG=${GITHUB_REF##*/}
-          mv bin chaosd-${GIT_TAG}-linux-amd64
-          tar czvf chaosd-${GIT_TAG}-linux-amd64.tar.gz chaosd-${GIT_TAG}-linux-amd64
-          aws s3 cp chaosd-${GIT_TAG}-linux-amd64.tar.gz ${{ secrets.AWS_BUCKET_NAME }}/chaosd-${GIT_TAG}-linux-amd64.tar.gz
+          mv bin chaosd-${GIT_TAG}-linux-${{ matrix.arch }}
+          tar czvf chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz chaosd-${GIT_TAG}-linux-${{ matrix.arch }}
+          aws s3 cp chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz ${{ secrets.AWS_BUCKET_NAME }}/chaosd-${GIT_TAG}-linux-${{ matrix.arch }}.tar.gz