diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index b246356..1a37af5 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -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 }} diff --git a/.github/workflows/build-installers.yaml b/.github/workflows/build-installers.yaml index fb70c03..9a24cba 100644 --- a/.github/workflows/build-installers.yaml +++ b/.github/workflows/build-installers.yaml @@ -109,7 +109,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: "recursive" @@ -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 }} diff --git a/.github/workflows/ensure-version-increment.yml b/.github/workflows/ensure-version-increment.yml index 6f159e4..2bab50c 100644 --- a/.github/workflows/ensure-version-increment.yml +++ b/.github/workflows/ensure-version-increment.yml @@ -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 diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index beb73d8..b27ab68 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -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 }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 349ac58..4dec224 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20 diff --git a/README.md b/README.md index f20d7fb..e37754e 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/pyinstaller.spec b/pyinstaller.spec index 876ffe3..07962ae 100644 --- a/pyinstaller.spec +++ b/pyinstaller.spec @@ -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 @@ -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=[], diff --git a/pyproject.toml b/pyproject.toml index 34c98f5..495d679 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 ",