From 137ec4fd177d0cdb43cfae6d38c1a1ef9988ba45 Mon Sep 17 00:00:00 2001
From: Simplxs <simplxsa@gmail.com>
Date: Fri, 10 May 2024 22:07:28 +0800
Subject: [PATCH] fix: build file name

---
 .github/workflows/build.yml          |  4 ++--
 .github/workflows/docker-publish.yml | 36 +++++++++++++++-------------
 .github/workflows/release.yml        |  2 +-
 src/sign.cpp                         |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6861f76..9fa9da9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Upload build
         uses: actions/upload-artifact@v4
         with:
-          name: SignerServer-${{ matrix.os }}-${{ matrix.arch }}
+          name: SignerServer-${{ matrix.os }}-${{ matrix.arch }}.zip
           path: |
             SignerServer.dll
             load.js
@@ -86,7 +86,7 @@ jobs:
       - name: Upload build
         uses: actions/upload-artifact@v4
         with:
-          name: SignerServer-${{ matrix.os }}-${{ matrix.arch }}
+          name: SignerServer-${{ matrix.os }}-${{ matrix.arch }}.zip
           path: |
             libSignerServer.so 
             load.js
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 5dfdfa6..193c4f5 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,31 +10,33 @@ env:
   GITHUB_REPO: Simplxss/SignerServer
 
 jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+
   publish-dockerhub:
     runs-on: ubuntu-latest
+    needs: build
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Get artifacts
-        run: |
-          bash get_artifacts.sh ${{ secrets.GITHUB_TOKEN }} $(curl "https://api.github.com/repos/NapNeko/NapCatQQ/releases/latest" | jq -r '.tag_name')
-      - name: Set up Docker buildx
+
+      - name: Download All Artifact
+        uses: actions/download-artifact@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # Fork from https://github.com/koishijs/boilerplate/blob/master/.github/workflows/docker.yml
-      - name: Run buildx and push
-        run: |
-          TAG=$(curl "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" | jq -r '.tag_name')
-          docker buildx build \
-            --output "type=image,push=true" \
-            --platform linux/amd64,linux/arm64 \
-            --tag ${DOCKER_REPO}:$TAG \
-            --tag ${DOCKER_REPO}:latest \
-            --file ./Dockerfile \
-            .
-      - name: Docker Hub logout
-        run: docker logout
\ No newline at end of file
+          
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: user/app:latest
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3818477..37e2cc3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/download-artifact@v4
     
     - name: Create Release Draft and Upload Artifacts
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         name: SignerServer V${{ env.VERSION }}
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/sign.cpp b/src/sign.cpp
index bb467e4..98914cf 100644
--- a/src/sign.cpp
+++ b/src/sign.cpp
@@ -52,7 +52,7 @@ std::map<std::string, uint64_t> addrMap = {
 	{"3.2.7-23361", 0x4C93C57}};
 #elif defined(_ARM64_ARCH_)
 std::map<std::string, uint64_t> addrMap = {
-	{"3.2.7-23361", 0x4C93C57}};
+	{"3.2.7-23361", 0x351EC98}};
 #endif
 #endif