Skip to content

Commit

Permalink
CI ARM: update to bullseye
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinPulec committed Sep 22, 2023
1 parent 3d27316 commit 8a196ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
18 changes: 1 addition & 17 deletions .github/scripts/Linux/arm/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,8 @@

# If changing the file, do not forget to regenerate cache in ARM Build GitHub action

ARCH=$1
OLDPWD=$(pwd)

raspbian_build_sdl2() {
(
apt-get -y build-dep libsdl2-dev
apt -y install libgbm-dev
SDL_VER=2.0.10 # 2.0.14 doesn't compile with Rasbpian 10
curl -k -LO https://www.libsdl.org/release/SDL2-$SDL_VER.tar.gz
tar xaf SDL2-$SDL_VER.tar.gz
cd SDL2-$SDL_VER
./configure --enable-video-kmsdrm
make -j "$(nproc)" install
)
}

apt -y install curl gnupg
echo -k > ~/.curlrc

Expand All @@ -28,9 +14,7 @@ if grep -q Raspbian /etc/os-release; then
apt -y install libraspberrypi-dev
fi

apt -y install cmake=3.13.4-1 cmake-data=3.13.4-1 # 3.16 in the above added repository is broken with chrooted qemu-user-static

apt -y install autoconf automake build-essential git pkg-config libtool sudo
apt -y install autoconf automake build-essential cmake git pkg-config libtool sudo
apt -y install libcurl4-openssl-dev libsoxr-dev libspeexdsp-dev libssl-dev
apt -y install libasound2-dev portaudio19-dev libjack-dev
apt -y install libglew-dev libglfw3-dev libglm-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
sudo mkdir -p ~/chroot/var/tmp
sudo mv /var/tmp/*NDI* ~/chroot/var/tmp
wget http://archive.raspbian.org/raspbian.public.key -O - | sudo apt-key add -q
sudo qemu-debootstrap --keyring=${{ matrix.keyring }} --arch ${{ matrix.arch }} buster ~/chroot ${{ matrix.repo }}
sudo qemu-debootstrap --keyring=${{ matrix.keyring }} --arch ${{ matrix.arch }} bullseye ~/chroot ${{ matrix.repo }}
sudo cp -r $GITHUB_WORKSPACE/.github ~/chroot
sudo cp /usr/bin/qemu-${{ matrix.qemu_bin_arch }}-static ~/chroot/usr/bin
sudo chroot ~/chroot /.github/scripts/Linux/arm/bootstrap.sh ${{ matrix.arch }}
Expand Down

0 comments on commit 8a196ee

Please sign in to comment.