From f43e022578b8d235bf6a402c4f6de87cbf9a0d37 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 09:16:58 -0700 Subject: [PATCH 01/16] build: specify intel macs with new format --- .github/workflows/build-installers.yml | 2 +- .vscode/settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index ba820fa2..e01e5315 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -49,7 +49,7 @@ jobs: emoji: 🍎 runs-on: arm: [macOS, ARM64] - intel: [macos-latest] + intel: [macos-12] electron-builder-options: --macos electron-builder-unpacked: mac executable-extension: '' diff --git a/.vscode/settings.json b/.vscode/settings.json index 50402bf7..c9cf453e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.detectIndentation": false, "editor.tabSize": 2, "editor.insertSpaces": true, - "editor.wordBasedSuggestions": false, + "editor.wordBasedSuggestions": "off", "editor.formatOnPaste": true, "editor.formatOnSaveMode": "file", "editor.formatOnSave": true, From e1277c783caf3a4b813d84d8c72cc1d4ff44c0df Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 09:49:34 -0700 Subject: [PATCH 02/16] build: upgrade ruby for packaging application --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index e01e5315..32479796 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -176,7 +176,7 @@ jobs: run: | # TODO: make this an action? # https://github.com/Chia-Network/chia-blockchain/blob/9b8cdd36daebf2efe8777c98e212e564f4cdd475/build_scripts/build_linux_deb-2-installer.sh#L72 - sudo apt -y install ruby ruby-dev + sudo apt -y install ruby3.0 ruby3.0-dev sudo gem install public_suffix -v 4.0.7 sudo gem install fpm echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" From 669b7a7c9138c36eeb147adfeb278ef7711bf34a Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 10:37:28 -0700 Subject: [PATCH 03/16] build: ruby apt install for 3.0 --- .github/workflows/build-installers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 32479796..aecae243 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -176,6 +176,7 @@ jobs: run: | # TODO: make this an action? # https://github.com/Chia-Network/chia-blockchain/blob/9b8cdd36daebf2efe8777c98e212e564f4cdd475/build_scripts/build_linux_deb-2-installer.sh#L72 + sudo apt update sudo apt -y install ruby3.0 ruby3.0-dev sudo gem install public_suffix -v 4.0.7 sudo gem install fpm From 0115882d3a5a883da59203aa1c6049c275a245b6 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 10:59:57 -0700 Subject: [PATCH 04/16] build: swap to the new mac notarization tool --- .github/workflows/build-installers.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index aecae243..a7ddbd7d 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -209,12 +209,12 @@ jobs: if: matrix.os.matrix == 'macos' run: | DMG_FILE=$(find ${{ github.workspace }}/artifacts/ -type f -name '*.dmg') - npm install -g notarize-cli - notarize-cli \ - --file="$DMG_FILE" \ - --bundle-id net.chia.climate-wallet \ - --username "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \ - --password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}" + xcrun notarytool submit \ + --wait \ + --apple-id "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \ + --password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}" \ + --team-id "${{ secrets.APPLE_TEAM_ID }}" \ + "$DMG_FILE" # Windows Code Signing - name: Get installer name for signing From f855b7936610ae24f6a45938c08bbd0baab9d545 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 11:59:59 -0700 Subject: [PATCH 05/16] build: Use rvm for installing ruby3 --- .github/workflows/build-installers.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index a7ddbd7d..ae64dc7d 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -176,8 +176,12 @@ jobs: run: | # TODO: make this an action? # https://github.com/Chia-Network/chia-blockchain/blob/9b8cdd36daebf2efe8777c98e212e564f4cdd475/build_scripts/build_linux_deb-2-installer.sh#L72 - sudo apt update - sudo apt -y install ruby3.0 ruby3.0-dev + # + # Install Ruby Version Manager + curl -sSL https://get.rvm.io | bash -s stable + source ~/.rvm/scripts/rvm + # Install ruby3 + rvm install ruby-3 sudo gem install public_suffix -v 4.0.7 sudo gem install fpm echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" From 6aacd6f96e8155d95705f131a2df3344c7cafa1a Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 12:02:42 -0700 Subject: [PATCH 06/16] build: install keys for rvm --- .github/workflows/build-installers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index ae64dc7d..678e4ea3 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -178,6 +178,7 @@ jobs: # https://github.com/Chia-Network/chia-blockchain/blob/9b8cdd36daebf2efe8777c98e212e564f4cdd475/build_scripts/build_linux_deb-2-installer.sh#L72 # # Install Ruby Version Manager + gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB curl -sSL https://get.rvm.io | bash -s stable source ~/.rvm/scripts/rvm # Install ruby3 From ea27f34392c6d6eb0962f1296a20e3491d93787c Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Fri, 17 May 2024 12:04:41 -0700 Subject: [PATCH 07/16] build: gem commands without sudo --- .github/workflows/build-installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 678e4ea3..0c997a07 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -183,8 +183,8 @@ jobs: source ~/.rvm/scripts/rvm # Install ruby3 rvm install ruby-3 - sudo gem install public_suffix -v 4.0.7 - sudo gem install fpm + gem install public_suffix -v 4.0.7 + gem install fpm echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app From b61eb804bb877cd36f584e6df7720272b1ab58da Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 12:18:59 -0700 Subject: [PATCH 08/16] build: add path to ruby gem installed binaries --- .github/workflows/build-installers.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 0c997a07..68a7f873 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -182,7 +182,8 @@ jobs: curl -sSL https://get.rvm.io | bash -s stable source ~/.rvm/scripts/rvm # Install ruby3 - rvm install ruby-3 + rvm install ruby-3.2.1 + rvm use ruby-3.2.1 gem install public_suffix -v 4.0.7 gem install fpm echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" @@ -190,6 +191,7 @@ jobs: - name: Build electron app if: matrix.os.matrix != 'macos' run: | + source ~/.rvm/scripts/rvm npm install npm run build npm run package-none -- ${{ matrix.os.electron-builder-options }} ${{ matrix.arch.electron-builder-options }} From dd8ef3b2535f4f555d6274092bb51e0fb66b19f2 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 12:45:55 -0700 Subject: [PATCH 09/16] build: more targeting for places we now use rvm --- .github/workflows/build-installers.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 68a7f873..54f3ace3 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -189,7 +189,14 @@ jobs: echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app - if: matrix.os.matrix != 'macos' + if: matrix.os.matrix != 'macos' && ( matrix.os.matrix == 'linux' && matrix.arch.matrix != 'arm' ) + run: | + npm install + npm run build + npm run package-none -- ${{ matrix.os.electron-builder-options }} ${{ matrix.arch.electron-builder-options }} + + - name: Build electron app (Linux ARM) + if: matrix.os.matrix == 'linux' && matrix.arch.matrix == 'arm' run: | source ~/.rvm/scripts/rvm npm install From 7fdde3b35f0c388f27cf82082bb8666f6a67af6d Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 13:19:38 -0700 Subject: [PATCH 10/16] build: try new matching logic in if statement --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 54f3ace3..65cf5784 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -189,7 +189,7 @@ jobs: echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app - if: matrix.os.matrix != 'macos' && ( matrix.os.matrix == 'linux' && matrix.arch.matrix != 'arm' ) + if: ${{ !(matrix.os == 'linux' && matrix.arch == 'arm' ) || matrix.os == 'macos' }} run: | npm install npm run build From 542a183b7be9bbc4257a2021209ef0c46f853c05 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 13:23:52 -0700 Subject: [PATCH 11/16] build: fix typo in if logic --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 65cf5784..a5e9e34a 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -189,7 +189,7 @@ jobs: echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app - if: ${{ !(matrix.os == 'linux' && matrix.arch == 'arm' ) || matrix.os == 'macos' }} + if: ${{ !(matrix.os == 'linux' && matrix.arch == 'arm' ) || matrix.os != 'macos' }} run: | npm install npm run build From 9f2d5c1c951a32bb1cff7947f75ec3bda009aa14 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 13:29:33 -0700 Subject: [PATCH 12/16] build: more if statement matching --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index a5e9e34a..e96e0e6a 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -189,7 +189,7 @@ jobs: echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app - if: ${{ !(matrix.os == 'linux' && matrix.arch == 'arm' ) || matrix.os != 'macos' }} + if: ${{ !(matrix.os.matrix == 'linux' && matrix.arch.matrix == 'arm' ) || matrix.os.matrix != 'macos' }} run: | npm install npm run build From 14ce1bd69af131d30bffed1ca9e415e29f65bd06 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 13:37:00 -0700 Subject: [PATCH 13/16] build: if statement logic rework --- .github/workflows/build-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index e96e0e6a..6e850937 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -189,7 +189,7 @@ jobs: echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" - name: Build electron app - if: ${{ !(matrix.os.matrix == 'linux' && matrix.arch.matrix == 'arm' ) || matrix.os.matrix != 'macos' }} + if: (matrix.os.matrix == 'linux' && matrix.arch.matrix == 'intel') || matrix.os.matrix == 'windows' run: | npm install npm run build From 5d8fccec944c59c32443c201a4aa87d1241b3f6e Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Mon, 20 May 2024 13:55:19 -0700 Subject: [PATCH 14/16] build: more rvm troubleshooting --- .github/workflows/build-installers.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 6e850937..16777761 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -181,9 +181,11 @@ jobs: gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB curl -sSL https://get.rvm.io | bash -s stable source ~/.rvm/scripts/rvm + rvm reload # Install ruby3 rvm install ruby-3.2.1 rvm use ruby-3.2.1 + ruby --version gem install public_suffix -v 4.0.7 gem install fpm echo "USE_SYSTEM_FPM=true" >> "${GITHUB_ENV}" From 75d0754751bac1bd7c90deeeb50f0ebdc8f1a7fd Mon Sep 17 00:00:00 2001 From: William Wills Date: Tue, 27 Aug 2024 19:22:01 -0400 Subject: [PATCH 15/16] feat: updated url format to work with cadt-ui v2 --- src/components/token/TokenHeader.tsx | 2 +- src/constants/link.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/token/TokenHeader.tsx b/src/components/token/TokenHeader.tsx index e96bbe58..1a9ba759 100644 --- a/src/components/token/TokenHeader.tsx +++ b/src/components/token/TokenHeader.tsx @@ -52,7 +52,7 @@ const TokenHeader = () => { const handleViewDetails = () => { openExternal( - `${getCWLink()}/#/units?orgUid=${asset.orgUid}&search=${ + `${getCWLink()}/units?orgUid=${asset.orgUid}&search=${ asset.marketplaceIdentifier }` ) diff --git a/src/constants/link.ts b/src/constants/link.ts index 00dcad29..997b9ebe 100644 --- a/src/constants/link.ts +++ b/src/constants/link.ts @@ -1 +1 @@ -export const CW_LINK = 'https://app.climatewarehouse.chia.net' +export const CW_LINK = 'https://observer.climateactiondata.org' From 385ac273f5fa2a12b10a567ef7365bf17cee81d9 Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Tue, 27 Aug 2024 17:38:54 -0700 Subject: [PATCH 16/16] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac0aa8f1..685b5d60 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "author": "Chia Network (https://chia.net/)", "description": "Climate Wallet for Chia Blockchain", "productName": "Climate Wallet", - "version": "1.1.29", + "version": "1.1.30", "private": true, "homepage": "./", "main": "build/electron/main.js",