chore: Distinguish between abi1.0 and abi2.0 of loongarch64

xishang0128 · Feb 26, 2024 · e582941 · e582941
1 parent 0619c75
commit e582941
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/.github/mihomo.service b/.github/mihomo.service
@@ -10,7 +10,7 @@ CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIM
 AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SYS_TIME CAP_SYS_PTRACE CAP_DAC_READ_SEARCH
 Restart=always
 ExecStartPre=/usr/bin/sleep 2s
-ExecStart=/usr/local/bin/mihomo -d /etc/mihomo
+ExecStart=/usr/bin/mihomo -d /etc/mihomo
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,8 @@ jobs:
           - { goos: linux, goarch: mipsle, mips: softfloat, output: mipsle-softfloat }
           - { goos: linux, goarch: mips64, output: mips64 }
           - { goos: linux, goarch: mips64le, output: mips64le }
-          - { goos: linux, goarch: loong64, output: loong64 }
+          - { goos: linux, goarch: loong64, output: loong64-abi1, abi: '1' }
+          - { goos: linux, goarch: loong64, output: loong64-abi2, abi: '2' }
           - { goos: linux, goarch: riscv64, output: riscv64 }
           - { goos: linux, goarch: s390x, output: s390x }
 
@@ -77,17 +78,33 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Go1.22
-      if: ${{ matrix.jobs.version != '20' }}
+      if: ${{ matrix.jobs.version != '20' && matrix.jobs.goarch != 'loong64' }}
       uses: actions/setup-go@v5
       with:
         go-version: ^1.22
 
     - name: Set up Go1.20
-      if: ${{ matrix.jobs.version == '20' }}
+      if: ${{ matrix.jobs.version == '20' && matrix.jobs.goarch != 'loong64' }}
       uses: actions/setup-go@v5
       with:
         go-version: ^1.20
 
+    - name: Set up Go1.21 loongarch abi1
+      if: ${{ matrix.jobs.goarch == 'loong64' && matrix.jobs.abi == '1' }}
+      run: |
+        wget -q https://github.com/xishang0128/loongarch64-golang/releases/download/1.21.5/go1.21.5.linux-amd64-abi1.tar.gz
+        sudo tar zxf go1.21.5.linux-amd64-abi1.tar.gz
+        sudo rm -rf /opt/hostedtoolcache/go/1.20.14/x64/*
+        sudo cp -r go/* /opt/hostedtoolcache/go/1.20.14/x64
+
+    - name: Set up Go1.21 loongarch abi2
+      if: ${{ matrix.jobs.goarch == 'loong64' && matrix.jobs.abi == '2' }}
+      run: |
+        wget -q https://github.com/xishang0128/loongarch64-golang/releases/download/1.21.5/go1.21.5.linux-amd64-abi2.tar.gz
+        sudo tar zxf go1.21.5.linux-amd64-abi2.tar.gz
+        sudo rm -rf /opt/hostedtoolcache/go/1.20.14/x64/*
+        sudo cp -r go/* /opt/hostedtoolcache/go/1.20.14/x64
+
     - name: Set variables
       if: ${{github.ref_name=='Alpha'}}
       run: echo "VERSION=alpha-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
@@ -141,7 +158,11 @@ jobs:
       if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') }}
       run: |
         sudo apt-get install dpkg
-
+        if [ "${{matrix.jobs.goarch}}" = "loong64" ]; then
+          ARCH=loongarch64
+        else
+          ARCH=${{matrix.jobs.goarch}}
+        fi
         mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/DEBIAN
         mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/usr/bin
         mkdir -p mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}/etc/mihomo
@@ -162,7 +183,7 @@ jobs:
         Version: 1.18.2-${VERSION}
         Section:
         Priority: extra
-        Architecture: ${{matrix.jobs.goarch}}
+        Architecture: ${ARCH}
         Maintainer: MetaCubeX <none@example.com>
         Homepage: https://wiki.metacubex.one/
         Description: The universal proxy platform.
@@ -178,7 +199,7 @@ jobs:
         mv mihomo*.rpm mihomo-${{matrix.jobs.goos}}-${{matrix.jobs.output}}-${VERSION}.rpm
 
     - name: Convert DEB to PKG
-      if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') }}
+      if: ${{ matrix.jobs.goos == 'linux' && !contains(matrix.jobs.goarch, 'mips') && !contains(matrix.jobs.goarch, 'loong64') }}
       run: |
         docker pull archlinux
         docker run --rm -v ./:/mnt archlinux bash -c "