Merge remote-tracking branch 'origin/main' into beta

.github/workflows/release.yml

@@ -22,10 +22,6 @@ concurrency:
 
 permissions: {}
 
-env:
- TARI_NETWORK: nextnet
- TARI_TARGET_NETWORK: nextnet
-
 jobs:
  builds:
  name: Building ${{ matrix.platform }}
@@ -54,20 +50,32 @@ 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)
- if: startsWith(runner.os,'Windows')
+ - 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
- export BETA_DATE=$(date +%Y-%m-%d)
+ 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

.updater/latest.json

@@ -1,23 +1,23 @@
 {
- "version": "0.3.7",
+ "version": "0.3.10",
  "notes": "Tari Universe - See the assets to download this version and install",
- "pub_date": "2024-09-18T20:12:55.308Z",
+ "pub_date": "2024-09-22T16:27:41.237Z",
  "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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFRxa1UzaWluZXhWN05SYm5oMHVPaVRzdFJjNmo1Ykd6TEJxbDkydW9maHBiSDZobnlhNzFiQVUyenBGRXU3WjJiWklaTjVwTzhxNjF6WngyOGtXa3djPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MDIxNjg4CWZpbGU6dGFyaS11bml2ZXJzZV8wLjMuMTBfYW1kNjQuQXBwSW1hZ2UudGFyLmd6Ck5qV3Z3NEhMdndnTWdLN1gyTG90NnlJMDh3cldyU0ZJRFFDU3hKVDdoSWVsUjdXTXdLQjRlRWRoTzdGVkNuMjhMMTk2VklWaG9iSUppSDFpT2JnS0FBPT0K",
+ "url": "https://github.com/tari-project/universe/releases/download/v0.3.10/tari-universe_0.3.10_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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGQvNHJ5QXFYY0p5MFF5TnpyeTIwZnJWRVRqbGxHMXIrOCt3ZS9DNFJhT2sxQU5SSUdvaTFydmVFWUlBR3p2RUVLcTlGN0VVM1VsMVcyK1Vpd25oOFFNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MDIyMTAxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClF4SktHYjMyWGdjWXBhaUJwU2s2ZDBKMGxlNkdWcXhKbGJlMitydkVQTC85NXpPMm1yTFQ2NzhBSTM3OERiZUVnRzdNWjQ0TXVxNnlLSzR3b29Wd0FnPT0K",
+ "url": "https://github.com/tari-project/universe/releases/download/v0.3.10/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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGQvNHJ5QXFYY0p5MFF5TnpyeTIwZnJWRVRqbGxHMXIrOCt3ZS9DNFJhT2sxQU5SSUdvaTFydmVFWUlBR3p2RUVLcTlGN0VVM1VsMVcyK1Vpd25oOFFNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MDIyMTAxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6ClF4SktHYjMyWGdjWXBhaUJwU2s2ZDBKMGxlNkdWcXhKbGJlMitydkVQTC85NXpPMm1yTFQ2NzhBSTM3OERiZUVnRzdNWjQ0TXVxNnlLSzR3b29Wd0FnPT0K",
+ "url": "https://github.com/tari-project/universe/releases/download/v0.3.10/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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlXUURxSXh6WHlKUFBZQnFwS3NxWWRYVnFEbUdzbDhjeWFibk84aU8yUGkySlhRUFNxUERwZExCUXg4K2pqSSt0NGFlcDlZbVNUUWxsSnkyQVNMS1FNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3MDIyNDU3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjMuMTBfeDY0X2VuLVVTLm1zaS56aXAKMFdBL0NqTVhLNWhheEpwSGc0OEM3MEdPV0F0bHhUUVl3NGNhdnlGY3kreXFPTis3Y3RadDd1NFhKNVRVTWpYYkVmcXhZSzNzaFlHb0h4dndyRU5PQWc9PQo=",
+ "url": "https://github.com/tari-project/universe/releases/download/v0.3.10/Tari.Universe_0.3.10_x64_en-US.msi.zip"
  }
  }
 }