Merge branch 'main' into feat/clythor

tari-project · Sep 26, 2024 · 185ca32 · 185ca32
2 parents 09bb478 + a606c35
commit 185ca32
Show file tree

Hide file tree

Showing 180 changed files with 6,141 additions and 3,214 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,10 @@ name: Release
     #   - 'v[0-9]+.[0-9]+.[0-9]+'
     branches:
       - 'release'
+      - 'beta'
       - 'build-*'
+  schedule:
+    - cron: "05 00 * * *"
   workflow_dispatch:
 
 concurrency:
@@ -19,11 +22,6 @@ concurrency:
 
 permissions: {}
 
-
-env:
-  TARI_NETWORK: nextnet
-  TARI_TARGET_NETWORK: nextnet
-
 jobs:
   builds:
     name: Building ${{ matrix.platform }}
@@ -52,6 +50,39 @@ jobs:
           echo "tagName=v__VERSION__" >> $GITHUB_ENV
           echo "releaseName=Tari Universe v__VERSION__" >> $GITHUB_ENV
           #echo "releaseId=" >> $GITHUB_ENV
+          echo "TARI_NETWORK=nextnet" >> $GITHUB_ENV
+          echo "TARI_TARGET_NETWORK=nextnet" >> $GITHUB_ENV
+
+      - name: beta builds - Install dependencies (windows) [yq]
+        if: ${{ ( startsWith(runner.os,'Windows') ) && ( ! startsWith(github.ref, 'refs/heads/release') ) }}
+        run: |
+          choco upgrade yq -y
+
+      - name: beta builds - Install dependencies (linux) [yq]
+        if: ${{ ( startsWith(runner.os,'Linux') ) && ( ! startsWith(github.ref, 'refs/heads/release') ) }}
+        shell: bash
+        run: |
+          sudo bash ./scripts/check-get-yq.sh
+
+      - name: Set environment variables for beta builds
+        if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}
+        env:
+          BETA_STRING: "-beta"
+        shell: bash
+        run: |
+          #set -xueo pipefail
+          echo "TARI_NETWORK=esme" >> $GITHUB_ENV
+          echo "TARI_TARGET_NETWORK=testnet" >> $GITHUB_ENV
+          #export BETA_DATE=$(date +%Y-%m-%d)
+          # numeric-only and cannot be greater than 65535 for msi target
+          export BETA_DATE=4$(date +%m%d)
+          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 ".package.productName += \"${{ env.BETA_STRING }}\"" -i tauri.conf.json
+          yq eval ".package.version += \"-${BETA_DATE}\"" -i tauri.conf.json
+          sed -i.bak -E "s/^version\s*=\s*\"([0-9]+\.[0-9]+\.[0-9]+)\"/version = \"\1-${BETA_DATE}\"/" \
+            Cargo.toml
 
       - name: Node.js setup
         uses: actions/setup-node@v4
@@ -123,7 +154,7 @@ jobs:
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
           WINDOWS_SIGN_COMMAND: trusted-signing-cli -e https://eus.codesigning.azure.net/ -a Tari -c Tarilabs %1
         run: |
-          cd "$GITHUB_WORKSPACE/src-tauri"
+          cd "${GITHUB_WORKSPACE}/src-tauri"
           echo "{}" | \
             jq '.tauri .bundle .windows += {"signCommand": "${{ env.WINDOWS_SIGN_COMMAND }}"}' > \
               ./tauri.windows.conf.json
@@ -137,7 +168,7 @@ jobs:
 
       - name: Build Tauri apps
         id: build
-        uses: tauri-apps/tauri-action@v0
+        uses: tauri-apps/tauri-action@v0.5.14
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE || secrets.AZURE_TENANT_ID }}
@@ -156,15 +187,15 @@ jobs:
           tagName: ${{ env.tagName }}
           releaseName: ${{ env.releaseName }}
           releaseBody: 'Tari Universe - See the assets to download this version and install'
-          #releaseId: ${{ env.releaseId }}
+          # releaseId: ${{ env.releaseId }}
           releaseDraft: true
           prerelease: true
           includeDebug: false
           includeRelease: true
           args: ${{ matrix.args }}
 
-      - name: Upload
-        if: ${{ startsWith(github.ref, 'refs/heads/build-') }}
+      - name: Upload none releases
+        if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}
         uses: actions/upload-artifact@v4
         with:
           name: tari-universe_${{ steps.build.outputs.appVersion }}_${{ matrix.platform }}

diff --git a/.updater/latest.json b/.updater/latest.json
@@ -1,23 +1,23 @@
 {
-  "version": "0.3.7",
+  "version": "0.4.5",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-09-18T20:12:55.308Z",
+  "pub_date": "2024-09-25T16:59:39.886Z",
   "platforms": {
     "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFhVODNnSVhWTUtxQndITkhpR0xPWlBRUGI3VTJPWFUzY1RubzluQ2RKK1hIU2F0MW1qNVhIV29lQXIrRHJYTjJ3Y3M3bThaa0pJWlhVNWtHM1ZmamdVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2Njg5MzAwCWZpbGU6dGFyaS11bml2ZXJzZV8wLjMuN19hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKeS8zTHpnZEhhbnpBR3o3UWJOQUpEcU9QY0JGM05RWXFJTkhsRXhyYS9ySjhXVGNhWGVWczVueWpGY0FkcnNKdmRYS041VlVCNjcxdzlreUh2TTZZQ2c9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.3.7/tari-universe_0.3.7_amd64.AppImage.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFl6U2hCRXhYZWlScWE5ZkhmRkZ2UXBZTStRSTBJTHlrNVlicGowU0p0bnhodnN5QkZBRmY3YUlhN20rQXJRcWM3MXJ0bjFaWERzSEIxY3RRUnBHendnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MjgyMDgxCWZpbGU6dGFyaS11bml2ZXJzZV8wLjQuNV9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKbjVoMTZLTUdiZThXTTByMVJqbGpxd09XYWZ3VXYzTmN1cTZ2L1NsSitrQUFXUEtoWFo1YXlneUdVZG9DMitkZGVabDlXa0FMZUdIUkRoWWs1aWlVQ1E9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.4.5/tari-universe_0.4.5_amd64.AppImage.tar.gz"
     },
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGZsV2o0WjdsMUd4U2dzS09iQnBhY2NMOW96cXYyeEwrTHMyMTZza1dXcVBEczB3Z1V2OXZhMldaNlBLRUtJR0Z5QjdQUDhuUlFQRG1wamJ5TFVEQlFZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2Njg5NjkzCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClhUZ01TTnUycnBIaDFJTG9zMGpxcVN3Ni9ibHY2RVlLZmtKYTh0OWZVVlJLY3R2dGM4UnVveG13aW1CV0kxZTUvMUJuUG9HeERXSjJHMlJlOVFVN0RRPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.3.7/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFNqbkFmRVlKeVFIakMzU09jNzBRV2VDWmxzTytmbzcvZlllaHhSaWJ0ZFkxc1dGdGtQaFFub1BsSEVtNFRJWTBMOTczSVVFWmZyVmY1L1VDOW9RL2c4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MjgyNTY3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CmR6ZEZUeTlTMkFTOEtUSDF4SG1HOGEzdVRPUkxJNG1NY0ZGZmt0bmgyaDI4VnZScTZYSmJERVozZnJSQjFGSDdkcXlnSy9yWTlBS2dZbWd2N3c0UkFRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.4.5/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGZsV2o0WjdsMUd4U2dzS09iQnBhY2NMOW96cXYyeEwrTHMyMTZza1dXcVBEczB3Z1V2OXZhMldaNlBLRUtJR0Z5QjdQUDhuUlFQRG1wamJ5TFVEQlFZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2Njg5NjkzCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClhUZ01TTnUycnBIaDFJTG9zMGpxcVN3Ni9ibHY2RVlLZmtKYTh0OWZVVlJLY3R2dGM4UnVveG13aW1CV0kxZTUvMUJuUG9HeERXSjJHMlJlOVFVN0RRPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.3.7/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFNqbkFmRVlKeVFIakMzU09jNzBRV2VDWmxzTytmbzcvZlllaHhSaWJ0ZFkxc1dGdGtQaFFub1BsSEVtNFRJWTBMOTczSVVFWmZyVmY1L1VDOW9RL2c4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MjgyNTY3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CmR6ZEZUeTlTMkFTOEtUSDF4SG1HOGEzdVRPUkxJNG1NY0ZGZmt0bmgyaDI4VnZScTZYSmJERVozZnJSQjFGSDdkcXlnSy9yWTlBS2dZbWd2N3c0UkFRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.4.5/Tari.Universe_universal.app.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFIwRFJ6bmowSWo1YTJaaUpTZ2xkN0s5cU0xZHc3U0hHZnhFek5NLzRPQzhRTElMS2hkMG02UmVHeEwyQ2E1c0QwU3NiTWp0ZUQ0QmsyTFV2cWxGdmdNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI2NjkwMzcyCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjMuN194NjRfZW4tVVMubXNpLnppcApFcE1MY1psVTQyczFiTFFJSWhDMDNwK2VmRHM0VkJvQW9JTWpSdGhQamFnZmVOeGMwTFB2YlZJODM5eWpnL2ppVzJGQ3IrVWdROVZiQnF1M2JXQmVEUT09Cg==",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.3.7/Tari.Universe_0.3.7_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFVZYnlHRUxUMDdQb0NVSkl2TUpmZmdsZjc1Qm5ydjNVbXUzRVdxUGFJWkwxckV3cEZVVkdVaS9pUEgyOEhBaFlySFBvTHhqYWo2OFl1NHpUMk1yVlFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MjgzNTc3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjQuNV94NjRfZW4tVVMubXNpLnppcApLbFdLV3ZFS3hHYjBzRXJUQTV5MVlYamE3RTVyNjlHZEh0NjBZcFQxcUxoOGE1UVJqMXFjVDM3QVliUGdGNWhhYk1USnZuNVhhVUd5aFdaU1RkQVhCQT09Cg==",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.4.5/Tari.Universe_0.4.5_x64_en-US.msi.zip"
     }
   }
 }