From 7492b51d3514b0428ac3815a3c2f95ef13186d3c Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 16 Sep 2024 17:19:40 +0200 Subject: [PATCH 1/2] Work around SUIT related build breakage --- build-with-checkouts.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-with-checkouts.sh b/build-with-checkouts.sh index d6287da..472132a 100644 --- a/build-with-checkouts.sh +++ b/build-with-checkouts.sh @@ -20,4 +20,11 @@ cargo update # target is not added the same way. rustup target add thumbv7em-none-eabihf +# We're not running with RIOT_CI_BUILD to avoid getting *all* the effects of +# things being different, but that also means there is an interactive prompt as +# soon as one starts doing anything SUIT related. Can't set RIOT_CI_BUILD +# because it'd also change the output path, so we emulate a user picking +# 'none' whyen prompted. +echo '0' | make -C RIOT/examples/suit_update suit/genkey + make build-cargo-docs From ea3cf7c839a3aa68594aac235d8766929188ee1e Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 16 Sep 2024 17:28:30 +0200 Subject: [PATCH 2/2] CI: Run on all refs, but only rsync main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25b0b6b..b115a1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,6 @@ name: build on: push: - branches: ["main"] schedule: # While we don't have hooks triggering this from riot-sys etc, a cron job # is the next best thing @@ -33,6 +32,7 @@ jobs: env: SECRET_KEY: ${{ secrets.SECRET_KEY }} SECRET_PORT: ${{ secrets.SECRET_PORT }} + if: github.ref == 'refs/heads/main' run: | # Beware that SSH uses /root and not ~ = ${HOME} = /github/home/ as # documented on https://bugzilla.mindrot.org/show_bug.cgi?id=3048