From df1137ef7542a4ffa0060e078cd46f402499a075 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Thu, 9 Feb 2023 18:05:41 -0500
Subject: [PATCH] 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>
---
.github/workflows/build-test.yaml | 2 +-
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 4a3e0ced6..99666686f 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 031b1009f..e26c48c4f 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/