Merge branch 'main' into refactor/actions

tari-project · Feb 26, 2025 · de57651 · de57651
2 parents 4b35dae + 8ca1079
commit de57651
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -89,12 +89,12 @@ jobs:
           cd "${GITHUB_WORKSPACE}/src-tauri"
           echo "releaseName=Tari Universe ${{ env.BETA_STRING }} v__VERSION__-${BETA_DATE}" >> $GITHUB_ENV
           # Don't mess with the double quotes and inner escaped quotes
-          yq eval ".productName = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} \"" -i tauri.conf.json
-          yq eval ".mainBinaryName = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} \"" -i tauri.conf.json
-          yq eval ".app.windows[0].title = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} | Testnet\"" -i tauri.conf.json
-          yq eval ".identifier = \"com.tari.universe.beta\"" -i tauri.conf.json
+          yq eval ".productName = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} \"" --output-format=json -i tauri.conf.json
+          yq eval ".mainBinaryName = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} \"" --output-format=json -i tauri.conf.json
+          yq eval ".app.windows[0].title = \"Tari Universe ${{ env.BETA_STRING }} - ${BETA_DATE} | Testnet\"" --output-format=json -i tauri.conf.json
+          yq eval ".identifier = \"com.tari.universe.beta\"" --output-format=json -i tauri.conf.json
           yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/main/.updater/beta-latest.json\"]" \
-            -i tauri.conf.json
+            --output-format=json -i tauri.conf.json
           cat tauri.conf.json
           sed -i.bak -e "s/\"icons\//\"beta-icons\//g" tauri.conf.json
 
@@ -115,12 +115,12 @@ jobs:
           cd "${GITHUB_WORKSPACE}/src-tauri"
           TU_VERSION=$(jq -r .version tauri.conf.json)
           # Don't mess with the double quotes and inner escaped quotes
-          yq eval ".productName = \"Tari Universe\"" -i tauri.conf.json
-          yq eval ".mainBinaryName = \"Tari Universe\"" -i tauri.conf.json
-          yq eval ".app.windows[0].title = \"Tari Universe v${TU_VERSION} | Testnet\"" -i tauri.conf.json
-          yq eval ".identifier = \"com.tari.universe\"" -i tauri.conf.json
+          yq eval ".productName = \"Tari Universe\"" --output-format=json -i tauri.conf.json
+          yq eval ".mainBinaryName = \"Tari Universe\"" --output-format=json -i tauri.conf.json
+          yq eval ".app.windows[0].title = \"Tari Universe v${TU_VERSION} | Testnet\"" --output-format=json -i tauri.conf.json
+          yq eval ".identifier = \"com.tari.universe\"" --output-format=json -i tauri.conf.json
           yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/main/.updater/latest.json\", \"https://cdn-universe.tari.com/tari-project/universe/updater/latest.json\"]" \
-            -i tauri.conf.json
+            --output-format=json -i tauri.conf.json
 
       - uses: actions/setup-node@v4
         with:
@@ -235,7 +235,7 @@ jobs:
           includeRelease: true
           args: ${{ matrix.args }} --features "${{ env.TS_FEATURES }}"
 
-      - name: Debug Step - artifactPaths
+      - name: Locate artifacts path
         if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}
         continue-on-error: true
         env:
@@ -250,3 +250,10 @@ jobs:
         with:
           name: tari-universe-beta_${{ steps.build.outputs.appVersion }}_${{ matrix.platform }}${{ matrix.extra }}
           path: "${{ join(fromJSON(steps.build.outputs.artifactPaths), '\n') }}"
+
+      - name: Windows debug symbols - Upload asset
+        if: startsWith(runner.os,'Windows')
+        uses: actions/upload-artifact@v4
+        with:
+          name: tari_universe.pdb
+          path: "${{ github.workspace }}/src-tauri/target/release/tari_universe.pdb"