CI build tweaks - main failing (#432)

* remove macos-11 builds from CI (dependencies now requiring builds taking over 45min)
* changes to Linux docker container to avoid apt issues with Docker caches
This commit is contained in:
charlie-foxtrot 2023-11-16 17:12:50 -08:00 committed by GitHub
parent 872ebb74d2
commit fa4c9d7b5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions

View File

@ -3,11 +3,17 @@ FROM ubuntu:20.04
RUN sed -i 's/^# \(.*export LS_OPTIONS.*$\)/\1/g' ~/.bashrc && \
sed -i 's/^# \(.*alias ll.*$\)/\1/g' ~/.bashrc
RUN TZ=America/Los_Angeles DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update && \
apt-get install -y \
tzdata\
git \
sudo \
gdb
WORKDIR /app
COPY .github/install_dependencies /app/
RUN apt-get install git sudo gdb -y
RUN /app/install_dependencies
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@ -3,9 +3,17 @@ FROM ubuntu:latest
RUN sed -i 's/^# \(.*export LS_OPTIONS.*$\)/\1/g' ~/.bashrc && \
sed -i 's/^# \(.*alias ll.*$\)/\1/g' ~/.bashrc
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update && \
apt-get install -y \
tzdata\
git \
sudo \
gdb
WORKDIR /app
COPY .github/install_dependencies /app/
RUN apt-get install git sudo gdb -y
RUN /app/install_dependencies
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

View File

@ -23,14 +23,6 @@ case "${unameOut}" in
Darwin*)
echo "Installing MacOS dependencies"
brew update
# brew upgrade is taking 45+ min on macos-11 images, so skip it
if [[ $(sw_vers -productVersion | cut -d '.' -f 1) -le 11 ]] ; then
echo 'skipping brew upgrade'
else
brew upgrade
fi
brew install \
lame \
libshout \

View File

@ -11,7 +11,7 @@ jobs:
build:
strategy:
matrix:
os: [ ubuntu-22.04, macos-12, rpi3b, macos-11, macos-13, ubuntu-20.04 ]
os: [ ubuntu-22.04, macos-12, rpi3b, macos-13, ubuntu-20.04 ]
runs-on: ${{ matrix.os }}
timeout-minutes: 35 # runtime across all OSs, runs can get queued
steps:

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
build*/
.DS_Store
.cache
compile_commands.json
rtl_airband*.log