From eba4189660c5336c0dcabbc38ecc73bfb085a02e Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong (cubxxw)" <3293172751nss@gmail.com>
Date: Tue, 9 Jan 2024 16:46:25 +0800
Subject: [PATCH] fix: fox openim support arm arch

Signed-off-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
---
 .github/workflows/openimci.yml | 14 +++++++-------
 scripts/.spelling_failures     |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/openimci.yml b/.github/workflows/openimci.yml
index 57a4180b1..dce5649df 100644
--- a/.github/workflows/openimci.yml
+++ b/.github/workflows/openimci.yml
@@ -125,7 +125,6 @@ jobs:
       matrix:
         go_version: ["1.21"]
         os: ["ubuntu-latest"]
-        arch: [arm64, armv7, amd64]
     steps:
     - name: Checkout and Install OpenIM
       uses: actions/checkout@v4
@@ -179,7 +178,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
 
   execute-scripts:
-    name: Execute OpenIM Script On ${{ matrix.os }}
+    name: Execute OpenIM Script On ${{ matrix.os }}-${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     permissions:
         contents: write
@@ -188,8 +187,9 @@ jobs:
       name: openim
     strategy:
       matrix:
-        go_version: ["1.20"]
+        go_version: ["1.21"]
         os: ["ubuntu-latest", "macos-latest"]
+        arch: [arm64, armv7, amd64]
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -207,7 +207,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
     # - name: Install latest Bash (macOS only)
-    #   if: runner.os == 'macOS'
+    #   if: runner.os == 'macOS' && matrix.arch == 'arm64'
     #   run: |
     #     /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
     #     brew update
@@ -227,7 +227,7 @@ jobs:
         sudo sleep 20
 
     # - name: Set up Docker for macOS
-    #   if: runner.os == 'macOS'
+    #   if: runner.os == 'macOS' && matrix.arch == 'arm64'
     #   run: |
     #     brew install --cask docker
     #     open /Applications/Docker.app
@@ -258,13 +258,13 @@ jobs:
         sudo make check
 
     - name: Restart Services and Print Logs for Ubuntu
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && matrix.arch == 'amd64'
       run: |
         sudo make restart
         sudo make check
 
     - name: Build, Start, Check Services and Print Logs for macOS
-      if: runner.os == 'macOS'
+      if: runner.os == 'macOS' && matrix.arch == 'arm64'
       run: |
         make build
 
diff --git a/scripts/.spelling_failures b/scripts/.spelling_failures
index 2f102c450..149d314ba 100644
--- a/scripts/.spelling_failures
+++ b/scripts/.spelling_failures
@@ -3,5 +3,6 @@ go.mod
 go.sum
 third_party/
 translations/
-log
+logs
+.git
 .golangci.yml
\ No newline at end of file