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.

Sign up for GitHub

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

substitute version in #17

Merged
merged 5 commits into from
Jun 1, 2024
Merged

substitute version in #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8062fba
substitute version in
chrisns Jun 1, 2024
77af3c1
try env here
chrisns Jun 1, 2024
1c6cc3b
try env here
chrisns Jun 1, 2024
59574ca
define default version of 0.0.0
chrisns Jun 1, 2024
fd92144
accidental paste
chrisns Jun 1, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
build:
name: Build
runs-on: ubuntu-latest
needs:
- semver
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
Expand All @@ -27,6 +29,8 @@ jobs:
- uses: devcontainers/ci@a56d055efecd725e8cfe370543b6071b79989cc8 # v0.3
with:
runCmd: rake build
env: |
VERSION=${{ needs.semver.outputs.semantic_version}}
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
with:
name: firmware-factory.bin
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ end
desc "Build/Compile with esphome"
task :build do
sh '[ ! -f "lexis.ttf" ] && wget -L -O "lexis.ttf" "https://github.com/damianvila/font-lexis/raw/main/fonts/lexis.ttf" || true'
sh "esphome compile childrensclock.yaml"
sh "esphome -s VERSION ${VERSION:=0.0.0} compile childrensclock.yaml"
end
2 changes: 1 addition & 1 deletion childrensclock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ esphome:
- src/childrensclock.h
project:
name: chrisns.childrens-clock
version: 0.0.1
version: $VERSION
on_boot:
priority: 700
then:
Expand Down
Loading