Skip to content

Commit

Permalink
ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dadleyy committed Oct 31, 2023
1 parent 6b54bf4 commit 21f7535
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 33 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,6 @@ jobs:
- name: "pio: check"
run: pio check

- name: "pio(firebeetle): run firebeetle"
run: pio run -e firebeetle

- name: "bundle(firebeetle): prepare-dir"
run: mkdir -p $DISTRIBUTABLE_DIRECTORY_NAME/firebeetle

- name: "bundle(firebeetle): copy-bin"
run: |
gpg --trust-model always -e -r $BEETLE_GPG_KEY_ID -o \
$DISTRIBUTABLE_DIRECTORY_NAME/firebeetle/firmware.bin.pgp \
.pio/build/firebeetle/firmware.bin
- name: "bundle(firebeetle): copy-map"
run: |
gpg --trust-model always -e -r $BEETLE_GPG_KEY_ID -o \
$DISTRIBUTABLE_DIRECTORY_NAME/firebeetle/firmware.map.pgp \
.pio/build/firebeetle/firmware.map
- name: "bundle(firebeetle): copy-elf"
run: |
gpg --trust-model always -e -r $BEETLE_GPG_KEY_ID -o \
$DISTRIBUTABLE_DIRECTORY_NAME/firebeetle/firmware.elf.pgp \
.pio/build/firebeetle/firmware.elf
- name: "bundle(firebeetle): copy-partitions"
run: |
gpg --trust-model always -e -r $BEETLE_GPG_KEY_ID -o \
$DISTRIBUTABLE_DIRECTORY_NAME/firebeetle/partitions.bin.pgp \
.pio/build/firebeetle/partitions.bin
- name: "pio(xiao): upgrade"
run: pio upgrade

Expand Down
3 changes: 3 additions & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[toolchain]
channel = "1.72.0"
targets = ["armv7-unknown-linux-gnueabihf"]
3 changes: 0 additions & 3 deletions src/beetle-ui/src/Route.elm
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,6 @@ routeLoadedEnv env url maybeId =

matched =
Matched ( loginRoute, Cmd.none )

_ =
Debug.log "parsed" matched
in
Maybe.map (always ifLoaded) maybeId
|> Maybe.withDefault matched
Expand Down

0 comments on commit 21f7535

Please sign in to comment.