Skip to content

Commit

Permalink
Merge pull request #228 from Chia-Network/develop
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
TheLastCicada authored Nov 12, 2024
2 parents f0079fa + f26f3f4 commit 7752083
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout current branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Need PACKAGE_ADMIN_PAT token so when the tag is created, the tag automation runs
token: ${{ secrets.PACKAGE_ADMIN_PAT }}
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/build-installers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"

Expand Down Expand Up @@ -175,9 +175,20 @@ jobs:
mkdir artifacts/
cp ./dist/main${{ matrix.os.executable-extension }} ./artifacts/${{ matrix.config.app-name }}_${{ steps.tag-name.outputs.TAGNAME || github.sha }}_${{ matrix.arch.artifact-name }}${{ matrix.os.executable-extension }}
- name: Test for secrets access
id: check_secrets
shell: bash
run: |
unset HAS_SIGNING_SECRET
if [ -n "$SIGNING_SECRET" ]; then HAS_SIGNING_SECRET='true' ; fi
echo "HAS_SIGNING_SECRET=${HAS_SIGNING_SECRET}" >> "$GITHUB_OUTPUT"
env:
SIGNING_SECRET: "${{ secrets.SM_CLIENT_CERT_FILE_B64 }}"

# Windows Code Signing
- name: Sign windows artifacts
if: matrix.os.matrix == 'windows'
if: matrix.os.matrix == 'windows' && steps.check_secrets.outputs.HAS_SIGNING_SECRET
uses: chia-network/actions/digicert/windows-sign@main
env:
SM_TOOLS_DOWNLOAD_URL: ${{ vars.SM_TOOLS_DOWNLOAD_URL }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ensure-version-increment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout current branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: branch-repo

- name: Checkout main
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: main
path: main-repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: Chia-Network/actions/clean-workspace@main

- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# Need PACKAGE_ADMIN_PAT token so when the tag is created, the tag automation runs
token: ${{ secrets.PACKAGE_ADMIN_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive

Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,13 @@ Only when in `explorer` mode, the following configurations are relevant:
poetry install
```

- Install node.js for linter using [nvm](https://github.com/nvm-sh/nvm)

```sh
nvm install
nvm use
```

- Run the main script for development.

```sh
Expand Down
8 changes: 6 additions & 2 deletions pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import importlib
import pathlib
import sys
from PyInstaller.utils.hooks import collect_submodules

ROOT = pathlib.Path(importlib.import_module("chia").__file__).absolute().parent.parent
Expand All @@ -13,12 +14,15 @@ datas.append(("./app/core/chialisp/*.hex", "./app/core/chialisp"))
datas.append(("./.env", "./"))
datas.append(("./config.yaml", "./"))

bins = []
if sys.platform == "win32":
bins.append((ROOT / "mpir_*.dll", "."))

block_cipher = None

a = Analysis(
["app/main.py"],
pathex=["./chia-blockchain"],
binaries=[],
binaries=bins,
datas=datas,
hiddenimports=[*collect_submodules("chia")],
hookspath=[],
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "Chia Climate Token Driver"
version = "1.0.40"
version = "1.1.0"
description = "https://github.com/Chia-Network/climate-token-driver"
authors = [
"Harry Hsu <[email protected]>",
Expand Down

0 comments on commit 7752083

Please sign in to comment.