diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2023-02-09 18:05:41 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2023-02-09 20:57:53 -0500 |
| commit | df1137ef7542a4ffa0060e078cd46f402499a075 (patch) | |
| tree | a7420ba674b753c1665b3ae59cc6f1a5e949a9fe | |
| parent | 5ffe5d6349bd04a0e54bb2dad2aeffe01120fa21 (diff) | |
| download | kutter-df1137ef7542a4ffa0060e078cd46f402499a075.tar.gz kutter-df1137ef7542a4ffa0060e078cd46f402499a075.tar.xz kutter-df1137ef7542a4ffa0060e078cd46f402499a075.zip | |
workflows: Convert to Ubuntu 20.04 for build test
This also updates to the latest version of pru-gcc.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | .github/workflows/build-test.yaml | 2 | ||||
| -rwxr-xr-x | scripts/ci-install.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 4a3e0ced..99666686 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh index 031b1009..e26c48c4 100755 --- a/scripts/ci-install.sh +++ b/scripts/ci-install.sh @@ -16,7 +16,7 @@ mkdir -p ${BUILD_DIR} ${CACHE_DIR} ###################################################################### echo -e "\n\n=============== Install system dependencies\n\n" -PKGS="virtualenv python-dev libffi-dev build-essential" +PKGS="virtualenv python2-dev libffi-dev build-essential" PKGS="${PKGS} gcc-avr avr-libc" PKGS="${PKGS} libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi" PKGS="${PKGS} pv libmpfr-dev libgmp-dev libmpc-dev texinfo bison flex" @@ -35,10 +35,10 @@ if [ ! -f ${PRU_FILE} ]; then cd ${BUILD_DIR} git config --global user.email "you@example.com" git config --global user.name "Your Name" - git clone https://github.com/dinuxbg/gnupru -b 2018.03-beta-rc3 --depth 1 + git clone https://github.com/dinuxbg/gnupru -b 2023.01 --depth 1 cd gnupru export PREFIX=${PRU_DIR} - ./download-and-patch.sh 2>&1 | pv -nli 30 > ${BUILD_DIR}/gnupru-build.log + ./download-and-prepare.sh 2>&1 | pv -nli 30 > ${BUILD_DIR}/gnupru-build.log ./build.sh 2>&1 | pv -nli 30 >> ${BUILD_DIR}/gnupru-build.log cd ${BUILD_DIR} tar cfz ${PRU_FILE} pru-gcc/ |