Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.1.30 #173

Merged
merged 19 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions .github/workflows/build-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down Expand Up @@ -176,18 +176,35 @@ 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 gem install public_suffix -v 4.0.7
sudo gem install fpm
#
# 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
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}"

- name: Build electron app
if: matrix.os.matrix != 'macos'
if: (matrix.os.matrix == 'linux' && matrix.arch.matrix == 'intel') || matrix.os.matrix == 'windows'
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
npm run build
npm run package-none -- ${{ matrix.os.electron-builder-options }} ${{ matrix.arch.electron-builder-options }}

- name: Build electron app (macOS)
if: matrix.os.matrix == 'macos'
env:
Expand All @@ -208,12 +225,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
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Chia Network <[email protected]> (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",
Expand Down
2 changes: 1 addition & 1 deletion src/components/token/TokenHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const TokenHeader = () => {

const handleViewDetails = () => {
openExternal(
`${getCWLink()}/#/units?orgUid=${asset.orgUid}&search=${
`${getCWLink()}/units?orgUid=${asset.orgUid}&search=${
asset.marketplaceIdentifier
}`
)
Expand Down
2 changes: 1 addition & 1 deletion src/constants/link.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const CW_LINK = 'https://app.climatewarehouse.chia.net'
export const CW_LINK = 'https://observer.climateactiondata.org'
Loading