3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin O'Connor 2023-02-09 18:05:41 -05:00
parent 5ffe5d6349
commit df1137ef75
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-test.yaml vendored
View File

@ -4,7 +4,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

6
scripts/ci-install.sh
View File

@ -16,7 +16,7 @@ mkdir -p ${BUILD_DIR} ${CACHE_DIR}
###################################################################### ######################################################################
echo -e "\n\n=============== Install system dependencies\n\n" 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} gcc-avr avr-libc"
PKGS="${PKGS} libnewlib-arm-none-eabi gcc-arm-none-eabi binutils-arm-none-eabi" 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" PKGS="${PKGS} pv libmpfr-dev libgmp-dev libmpc-dev texinfo bison flex"
@ -35,10 +35,10 @@ if [ ! -f ${PRU_FILE} ]; then
cd ${BUILD_DIR} cd ${BUILD_DIR}
git config --global user.email "you@example.com" git config --global user.email "you@example.com"
git config --global user.name "Your Name" 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 cd gnupru
export PREFIX=${PRU_DIR} 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 ./build.sh 2>&1 | pv -nli 30 >> ${BUILD_DIR}/gnupru-build.log
cd ${BUILD_DIR} cd ${BUILD_DIR}
tar cfz ${PRU_FILE} pru-gcc/ tar cfz ${PRU_FILE} pru-gcc/