From 5ed8b18f92dcff4e736539af789022328643cef3 Mon Sep 17 00:00:00 2001 From: BenZonneveld Date: Mon, 20 Jun 2022 22:46:59 +0200 Subject: [PATCH 1/4] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e5d45f..c5d45ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,9 @@ env: on: push: - branches: [ main ] + branches: [ main | SysExControl ] pull_request: - branches: [ main ] + branches: [ main | SysExControl ] jobs: Build: From d10c7849dfe6f18232d4d80cff6625b64dd7259c Mon Sep 17 00:00:00 2001 From: BenZonneveld Date: Mon, 20 Jun 2022 22:47:52 +0200 Subject: [PATCH 2/4] Update build.yml Update --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5d45ea..0f8738d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,9 @@ env: on: push: - branches: [ main | SysExControl ] + branches: [ SysExControl ] pull_request: - branches: [ main | SysExControl ] + branches: [ SysExControl ] jobs: Build: From fd345d8bba1f2a2f24508b109782a4e7f83a3638 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 21 Jun 2022 00:38:02 +0200 Subject: [PATCH 3/4] Restore build.yml Revert changes unrelated to the PR --- .github/workflows/build.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f8738d..6612e32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,13 +1,13 @@ -name: BuildSysex +name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} on: push: - branches: [ SysExControl ] + branches: [ main ] pull_request: - branches: [ SysExControl ] + branches: [ main ] jobs: Build: @@ -46,6 +46,18 @@ jobs: export PATH=$(readlink -f ./gcc-*aarch64-none*/bin/):$PATH RPI=3 bash -ex build.sh cp ./src/kernel*.img ./kernels/ + - name: Build for Raspberry Pi 2 + run: | + set -ex + export PATH=$(readlink -f ./gcc-*arm-none*/bin/):$PATH + RPI=2 bash -ex build.sh + cp ./src/kernel*.img ./kernels/ + - name: Build for Raspberry Pi 1 + run: | + set -ex + export PATH=$(readlink -f ./gcc-*arm-none*/bin/):$PATH + RPI=1 bash -ex build.sh + cp ./src/kernel*.img ./kernels/ - name: Get Raspberry Pi boot files run: | set -ex @@ -74,4 +86,3 @@ jobs: set -ex wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh bash ./upload.sh ./MiniDexed*.zip - From 6351fdcbcb7609b1643855615ebc170f68155386 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 21 Jun 2022 00:40:16 +0200 Subject: [PATCH 4/4] Restore build.sh Revert changes unrelated to the PR --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index aa1ad9b..271501a 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,9 @@ -f [ -z "${RPI}" ] ; then +#!/bin/bash + +set -e +set -x + +if [ -z "${RPI}" ] ; then echo "\$RPI missing, exting" exit 1 fi