Refactor Linux build workflow for ARM64 only

LizJeong · Jul 18, 2024 · ddc7b9f · ddc7b9f
1 parent 4db28da
commit ddc7b9f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 48 deletions.
diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml
@@ -8,24 +8,12 @@ on:
 jobs:
   build-linux-amd64:
     uses: ./.github/workflows/build-linux-amd64.yml
-    with:
-      arch: amd64
-    secrets: inherit
 
   build-linux-arm64:
     uses: ./.github/workflows/build-linux-arm64.yml
-    with:
-      arch: arm64
-    secrets: inherit
 
   build-darwin-amd64:
     uses: ./.github/workflows/build-darwin-amd64.yml
-    # with:
-    #   arch: amd64
-    secrets: inherit
 
   build-darwin-arm64:
-    uses: ./.github/workflows/build-darwin-arm64.yml
-    # with:
-    #   arch: arm64
-    secrets: inherit    
+    uses: ./.github/workflows/build-darwin-arm64.yml
diff --git a/.github/workflows/build-darwin-amd64.yml b/.github/workflows/build-darwin-amd64.yml
@@ -1,10 +1,8 @@
 name: Build Darwin AMD64
+
 on:
   workflow_call:
-    # inputs:
-    #   arch:
-    #     required: true
-    #     type: string
+
 jobs:
   build:
     runs-on: macos-13

diff --git a/.github/workflows/build-darwin-arm64.yml b/.github/workflows/build-darwin-arm64.yml
@@ -1,10 +1,8 @@
 name: Build Darwin ARM64
+
 on:
   workflow_call:
-    # inputs:
-    #   arch:
-    #     required: true
-    #     type: string
+
 jobs:
   build:
     runs-on: macos-latest
@@ -21,8 +19,6 @@ jobs:
         run: |
           L1_NETWORK_NAME="initiation-1"
           echo "L1_NETWORK_NAME=${L1_NETWORK_NAME}" >> $GITHUB_ENV
-          # Read MOVEVM_VERSION from config file
-          # MOVEVM_VERSION=$(grep MOVEVM_VERSION $GITHUB_WORKSPACE/.github/workflows/config | cut -d '=' -f2)
           MOVEVM_VERSION=$(go list -m github.com/initia-labs/movevm | awk '{print $2}')    
           echo "MOVEVM_VERSION=${MOVEVM_VERSION}" >> $GITHUB_ENV        
           echo "GOARCH=arm64" >> $GITHUB_ENV

diff --git a/.github/workflows/build-linux-amd64.yml b/.github/workflows/build-linux-amd64.yml
@@ -1,11 +1,7 @@
 name: Build Linux AMD64
 
 on:
-  workflow_call:
-    inputs:
-      arch:
-        required: true
-        type: string
+  workflow_call
 
 jobs:
   build:
@@ -21,21 +17,15 @@ jobs:
 
       - name: Set environment variables
         run: |
-          echo "GOARCH=${{ inputs.arch }}" >> $GITHUB_ENV
+          echo "GOARCH=amd64" >> $GITHUB_ENV
           echo "GOOS=linux" >> $GITHUB_ENV
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
           else
             VERSION="v0.0.0-${GITHUB_SHA::8}"
           fi
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-          if [ "${{ inputs.arch }}" == "amd64" ]; then
-            echo "ARCH_NAME=x86_64" >> $GITHUB_ENV
-          elif [ "${{ inputs.arch }}" == "arm64" ]; then
-            echo "ARCH_NAME=aarch64" >> $GITHUB_ENV
-          else
-            echo "ARCH_NAME=${{ inputs.arch }}" >> $GITHUB_ENV
-          fi
+          echo "ARCH_NAME=x86_64" >> $GITHUB_ENV
 
       - name: Print environment variables
         run: |

diff --git a/.github/workflows/build-linux-arm64.yml b/.github/workflows/build-linux-arm64.yml
@@ -1,10 +1,7 @@
 name: Build Linux ARM64
+
 on:
   workflow_call:
-    inputs:
-      arch:
-        required: true
-        type: string
 
 jobs:
   build:
@@ -25,21 +22,15 @@ jobs:
 
       - name: Set environment variables
         run: |
-          echo "GOARCH=${{ inputs.arch }}" >> $GITHUB_ENV
+          echo "GOARCH=arm64" >> $GITHUB_ENV
           echo "GOOS=linux" >> $GITHUB_ENV
           if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
             VERSION=${GITHUB_REF#refs/tags/}
           else
             VERSION="v0.0.0-${GITHUB_SHA::8}"
           fi
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-          if [ "${{ inputs.arch }}" == "amd64" ]; then
-            echo "ARCH_NAME=x86_64" >> $GITHUB_ENV
-          elif [ "${{ inputs.arch }}" == "arm64" ]; then
-            echo "ARCH_NAME=aarch64" >> $GITHUB_ENV
-          else
-            echo "ARCH_NAME=${{ inputs.arch }}" >> $GITHUB_ENV
-          fi
+          echo "ARCH_NAME=aarch64" >> $GITHUB_ENV
           
       - name: Build for ARM64
         env: