fix release.yml

terra-money · Nov 20, 2023 · 92eecf9 · 92eecf9
1 parent a3d9313
commit 92eecf9
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,8 +3,8 @@ name: Release
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+' # Push events to matching v*, i.e. v1.0, v20.15.10
-      - 'v[0-9]+.[0-9]+.[0-9]+-rc*' # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
+      - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v[0-9]+.[0-9]+.[0-9]+-rc*" # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5
 
 jobs:
   release:
@@ -24,7 +24,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     strategy:
       matrix:
-        build_type: ['build-release-arm64', 'build-release-amd64']
+        build_type: ["build-release-arm64", "build-release-amd64"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,8 +53,4 @@ jobs:
       - name: Display checksums
         run: cat build/release/checksum.txt
       - name: Upload the checksum to release
-<<<<<<< HEAD
         run: gh release upload ${{github.ref_name}} build/release/checksum.txt --repo ${{github.repository}}
-=======
-        run: gh release upload ${{github.ref_name}} build/release/checksum.txt --repo ${{github.repository}}
->>>>>>> v2.3.0