Skip to content

Commit 74a35b7

Browse files
BitMaker-hubBitMaker-hub
authored
Merge branch 'main' into master
2 parents c5f1e2d + 57ade69 commit 74a35b7

File tree

392 files changed

+37480
-1181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

392 files changed

+37480
-1181
lines changed

.github/workflows/main.yml renamed to .github/workflows/prerelease.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
name: PlatformIO CI
1+
name: Nerdminer Pre-Release
22

33
on:
44
push:
55
branches:
6-
- master
76
- dev
87

98
jobs:
@@ -26,33 +25,49 @@ jobs:
2625
run: pip install --upgrade platformio
2726
- name: Build PlatformIO Project
2827
run: pio run
29-
- name: Archive artifacts
28+
- name: Archive built binaries
3029
uses: actions/upload-artifact@v4
3130
with:
32-
name: builded-binaries-${{ github.sha }}
31+
name: built-binaries-${{ github.sha }}
3332
path: .pio/build/*/*.bin
3433
if-no-files-found: error
34+
- name: Archive bootapp binary
35+
uses: actions/upload-artifact@v4
36+
with:
37+
name: bootapp-binary-${{ github.sha }}
38+
path: ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin
39+
if-no-files-found: error
3540
- name: Get version
3641
id: version_step
3742
run: echo "version=`cat src/version.h | grep CURRENT_VERSION | awk -F\\" '{print $2}'`" >> $GITHUB_OUTPUT
3843

3944
prerelease:
4045
needs: build
46+
permissions:
47+
contents: write
48+
discussions: write
4149
runs-on: ubuntu-latest
4250
if: github.ref == 'refs/heads/dev'
4351
steps:
44-
- name: Download binaries
52+
- name: Download built binaries
53+
uses: actions/download-artifact@v4
54+
with:
55+
path: ${{ github.workspace }}/binaries
56+
name: built-binaries-${{ github.sha }}
57+
- name: Download bootapp binary
4558
uses: actions/download-artifact@v4
4659
with:
4760
path: ${{ github.workspace }}/binaries
48-
name: builded-binaries-${{ github.sha }}
49-
- name: Rename binaries
50-
run: find ${{ github.workspace }}/binaries -maxdepth 3 -type f -name "*.bin" -exec sh -c 'cp "$0" "${{ github.workspace }}/binaries/$(basename $(dirname "$0"))_$(basename $0)"' {} \;
61+
name: bootapp-binary-${{ github.sha }}
62+
- name: Rename built binaries
63+
run: find ${{ github.workspace }}/binaries -mindepth 2 -maxdepth 3 -type f -name "*.bin" -exec sh -c 'cp "$0" "${{ github.workspace }}/binaries/$(basename $(dirname "$0"))_$(basename $0)"' {} \;
5164
- name: Pre-release
5265
uses: softprops/action-gh-release@v2
5366
with:
5467
name: nerdminer-prerelease-${{ needs.build.outputs.version }}
5568
tag_name: nerdminer-prerelease-${{ needs.build.outputs.version }}
69+
target_commitish: ${{ github.sha }}
70+
generate_release_notes: true
5671
prerelease: true
5772
fail_on_unmatched_files: true
5873
files: ${{ github.workspace }}/binaries/*.bin

‎.github/workflows/release.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Nerdminer Release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
version: ${{ steps.version_step.outputs.version }}
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: actions/cache@v4
16+
with:
17+
path: |
18+
~/.cache/pip
19+
~/.platformio/.cache
20+
key: ${{ runner.os }}-pio
21+
- uses: actions/setup-python@v4
22+
with:
23+
python-version: '3.9'
24+
- name: Install PlatformIO Core
25+
run: pip install --upgrade platformio
26+
- name: Build PlatformIO Project
27+
run: pio run
28+
- name: Archive built binaries
29+
uses: actions/upload-artifact@v4
30+
with:
31+
name: built-binaries-${{ github.sha }}
32+
path: .pio/build/*/*.bin
33+
if-no-files-found: error
34+
- name: Archive bootapp binary
35+
uses: actions/upload-artifact@v4
36+
with:
37+
name: bootapp-binary-${{ github.sha }}
38+
path: ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin
39+
if-no-files-found: error
40+
- name: Get version
41+
id: version_step
42+
run: echo "version=`cat src/version.h | grep CURRENT_VERSION | awk -F\\" '{print $2}'`" >> $GITHUB_OUTPUT
43+
44+
release:
45+
needs: build
46+
permissions:
47+
contents: write
48+
discussions: write
49+
issues: write
50+
runs-on: ubuntu-latest
51+
if: github.ref == 'refs/heads/master'
52+
steps:
53+
- uses: trstringer/manual-approval@v1
54+
timeout-minutes: 120
55+
with:
56+
secret: ${{ github.TOKEN }}
57+
approvers: BitMaker-hub
58+
minimum-approvals: 1
59+
issue-title: "Releasing Nerdminer version ${{ needs.build.outputs.version }}"
60+
issue-body: "Please approve or deny the release of ${{ needs.build.outputs.version }}."
61+
exclude-workflow-initiator-as-approver: false
62+
- name: Download built binaries
63+
uses: actions/download-artifact@v4
64+
with:
65+
path: ${{ github.workspace }}/binaries
66+
name: built-binaries-${{ github.sha }}
67+
- name: Download bootapp binary
68+
uses: actions/download-artifact@v4
69+
with:
70+
path: ${{ github.workspace }}/binaries
71+
name: bootapp-binary-${{ github.sha }}
72+
- name: Rename built binaries
73+
run: find ${{ github.workspace }}/binaries -mindepth 2 -maxdepth 3 -type f -name "*.bin" -exec sh -c 'cp "$0" "${{ github.workspace }}/binaries/$(basename $(dirname "$0"))_$(basename $0)"' {} \;
74+
- name: Release
75+
uses: softprops/action-gh-release@v2
76+
with:
77+
name: nerdminer-release-${{ needs.build.outputs.version }}
78+
tag_name: nerdminer-release-${{ needs.build.outputs.version }}
79+
target_commitish: ${{ github.sha }}
80+
generate_release_notes: true
81+
make_latest: true
82+
fail_on_unmatched_files: true
83+
files: ${{ github.workspace }}/binaries/*.bin
84+

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ Every time an stratum job notification is received miner update its current work
6161
- ESP32-C3 Devkit ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/esp32-c3-devkitm-1.html))
6262
- ESP32-C3 Super Mini ([Board Info](https://docs.platformio.org/en/latest/boards/espressif32/seeed_xiao_esp32c3.html))
6363
- Waveshare ESP32-S3-GEEK ([Board Info](https://www.waveshare.com/wiki/ESP32-S3-GEEK))
64+
- LILYGO T-HMI ([Aliexpress link\*](https://s.click.aliexpress.com/e/_oFII4s2)) / Dev support: @cosmicpsyop
65+
- ESP32-C3 0.42 Inch OLED ([Aliexpress link\*](https://s.click.aliexpress.com/e/_oDmT4Id) / Dev support: @mrthiti / ⚡ wallet@thiti.dev)
66+
- ESP32-S3 0.42 Inch OLED ([Aliexpress link\*](https://s.click.aliexpress.com/e/_oFIMUoh) / Dev support: @mrthiti / ⚡ wallet@thiti.dev)
6467

6568
\*Affiliate links
6669

@@ -147,6 +150,7 @@ Recommended low difficulty share pools:
147150
| pool.nerdminer.io | 3333 | https://nerdminer.io | Mantained by CHMEX |
148151
| pool.pyblock.xyz | 3333 | https://pool.pyblock.xyz/ | Mantained by curly60e |
149152
| pool.sethforprivacy.com | 3333 | https://pool.sethforprivacy.com/ | Mantained by @sethforprivacy - public-pool fork |
153+
| pool.stompi.de | 3333 | http://web.stompi.de | Mantained by @odinstar - public-pool fork |
150154

151155
Other standard pools not compatible with low difficulty share:
152156

‎SLS/Themes.slt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"deftheme": {
3+
"name": "Default",
4+
"properties": []
5+
},
6+
"themes": [],
7+
"selected_theme": "Default"
8+
}

‎SLS/assets/Back/back.png‎

200 KB
Loading

‎SLS/assets/Back/splash.png‎

232 KB
Loading

‎SLS/assets/Fonts/Calculator.ttf‎

21.1 KB
Binary file not shown.

‎SLS/assets/Fonts/Starjedi.ttf‎

45.4 KB
Binary file not shown.

‎SLS/assets/Fonts/alien_encounters/Alien-Encounters-Bold-Italic.ttf‎

22.4 KB
Binary file not shown.

‎SLS/assets/Fonts/alien_encounters/Alien-Encounters-Bold.ttf‎

19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)