Build On Bullseye

This commit is contained in:
TheBrokenRail 2024-01-23 18:20:14 -05:00
parent 5c5538df2f
commit f7be586a4c
5 changed files with 5 additions and 33 deletions

View File

@ -23,18 +23,13 @@ jobs:
- ARMHF - ARMHF
name: Build name: Build
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: node:16-buster container: node:lts-bullseye
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
submodules: true submodules: true
# Dependencies # Dependencies
- name: Install CMake
run: |
echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list
apt-get update
apt-get install --no-install-recommends -y -t buster-backports cmake
- name: Install Dependencies - name: Install Dependencies
run: ./scripts/install-dependencies.sh ${{ matrix.arch }} run: ./scripts/install-dependencies.sh ${{ matrix.arch }}
# Build # Build
@ -62,11 +57,6 @@ jobs:
with: with:
submodules: true submodules: true
# Dependencies # Dependencies
- name: Install CMake
run: |
echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list
apt-get update
apt-get install --no-install-recommends -y -t buster-backports cmake
- name: Install Dependencies - name: Install Dependencies
run: ./scripts/install-dependencies.sh run: ./scripts/install-dependencies.sh
- name: Install ARM Toolchain - name: Install ARM Toolchain

View File

@ -70,7 +70,7 @@ add_compile_options(-ffast-math)
# Warnings # Warnings
add_compile_options(-Wall -Wextra -Werror -Wpointer-arith -Wshadow -Wnull-dereference) add_compile_options(-Wall -Wextra -Werror -Wpointer-arith -Wshadow -Wnull-dereference)
if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\") if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
# Prevents False Positives # Prevents False Positives
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 10.0) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 10.0)
add_compile_options(-Wno-stringop-overflow) add_compile_options(-Wno-stringop-overflow)

@ -1 +1 @@
Subproject commit b4c3ef9d0fdf46845f3e81e5d989dab06e71e6c1 Subproject commit 8e6c8d7effc54f8aecd30eda17069588298f4ada

View File

@ -4,7 +4,7 @@
Download packages [here](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases). Download packages [here](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases).
### System Requirements ### System Requirements
* Debian Buster/Ubuntu 18.04 Or Higher * Debian Bullseye/Ubuntu 20.04 Or Higher
* FUSE 2 * FUSE 2
* Debian/Ubuntu: ``sudo apt install libfuse2`` * Debian/Ubuntu: ``sudo apt install libfuse2``
* Arch: ``sudo pacman -S fuse2`` * Arch: ``sudo pacman -S fuse2``

View File

@ -20,9 +20,6 @@ run() {
sudo apt-get update sudo apt-get update
sudo apt-get dist-upgrade -y sudo apt-get dist-upgrade -y
# Architecture Detection
sudo apt-get install --no-install-recommends -y dpkg-dev
# Install Everything In One Go # Install Everything In One Go
PKG_QUEUE='' PKG_QUEUE=''
queue_pkg() { queue_pkg() {
@ -44,22 +41,7 @@ run() {
# Architecture-Specific Dependencies # Architecture-Specific Dependencies
architecture_specific_pkg() { architecture_specific_pkg() {
# Compiler # Compiler
if [ "$(dpkg-architecture -qDEB_BUILD_ARCH)" = "$1" ]; then queue_pkg crossbuild-essential-$1
queue_pkg \
gcc \
g++
else
case "$1" in
'armhf') GCC_TARGET='arm-linux-gnueabihf';;
'arm64') GCC_TARGET='aarch64-linux-gnu';;
'i386') GCC_TARGET='i686-linux-gnu';;
'amd64') GCC_TARGET='x86-64-linux-gnu';;
esac
queue_pkg \
"gcc-${GCC_TARGET}" \
libc6-dev-$1-cross \
"g++-${GCC_TARGET}"
fi
# Dependencies # Dependencies
queue_pkg \ queue_pkg \