Update action to build latest commit and try to redo build on docker

This commit is contained in:
Mary 2021-03-28 13:15:49 +02:00
parent ff96a6267f
commit 43aa299aec
4 changed files with 70 additions and 23 deletions

View file

@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Check out SDL sources - name: Check out SDL sources
run: | run: |
git clone --depth 1 --branch release-2.0.14 https://github.com/libsdl-org/SDL.git /tmp/SDL git clone --depth 1 https://github.com/libsdl-org/SDL.git /tmp/SDL
- name: Build binaries - name: Build binaries
run: | run: |
cd /tmp/SDL cd /tmp/SDL
@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Check out SDL sources - name: Check out SDL sources
run: | run: |
git clone --depth 1 --branch release-2.0.14 https://github.com/libsdl-org/SDL.git /tmp/SDL git clone --depth 1 https://github.com/libsdl-org/SDL.git /tmp/SDL
- name: Build i386 binaries - name: Build i386 binaries
run: | run: |
mkdir /tmp/i386 mkdir /tmp/i386
@ -57,4 +57,4 @@ jobs:
body: This PR has been auto-generated to update the Linux SDL binaries. body: This PR has been auto-generated to update the Linux SDL binaries.
branch: update-linux-binaries branch: update-linux-binaries
env: env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'

View file

@ -4,16 +4,41 @@ FROM debian:jessie
# Stretch and later. # Stretch and later.
COPY stretch-package-pins /etc/apt/preferences.d/stretch COPY stretch-package-pins /etc/apt/preferences.d/stretch
# Packages are from https://hg.libsdl.org/SDL/file/default/docs/README-linux.md # Packages are from https://github.com/libsdl-org/SDL/blob/3a1317ed47698c268574e1d0018edd6485f5dbc4/.github/workflows/main.yml
RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \ RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \ echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
apt-get update && \ apt-get update && \
apt-get install -y build-essential mercurial make cmake autoconf automake \ apt-get install -y wayland-protocols \
libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \ pkg-config \
libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \ ninja-build \
libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \ libasound2-dev \
libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \ libdbus-1-dev \
fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \ libegl1-mesa-dev \
libxkbcommon-dev wayland-protocols libgl1-mesa-dev \
libgles2-mesa-dev \
libglu1-mesa-dev \
libibus-1.0-dev \
libpulse-dev \
libsdl2-2.0-0 \
libsndio-dev \
libudev-dev \
libwayland-dev \
libwayland-client++0 \
wayland-scanner++ \
libwayland-cursor++0 \
libx11-dev \
libxcursor-dev \
libxext-dev \
libxi-dev \
libxinerama-dev \
libxkbcommon-dev \
libxrandr-dev \
libxss-dev \
libxt-dev \
libxv-dev \
libxxf86vm-dev \
libdrm-dev \
libgbm-dev\
libpulse-dev
ENTRYPOINT ["/entry"] ENTRYPOINT ["/entry"]

View file

@ -8,12 +8,37 @@ COPY stretch-package-pins /etc/apt/preferences.d/stretch
RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \ RUN echo deb http://deb.debian.org/debian/ stretch main > /etc/apt/sources.list.d/stretch.list && \
echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \ echo deb http://security.debian.org/debian-security stretch/updates main >> /etc/apt/sources.list.d/stretch.list && \
apt-get update && \ apt-get update && \
apt-get install -y build-essential mercurial make cmake autoconf automake \ apt-get install -y wayland-protocols \
libtool libasound2-dev libpulse-dev libaudio-dev libx11-dev libxext-dev \ pkg-config \
libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \ ninja-build \
libxss-dev libgl1-mesa-dev libesd0-dev libdbus-1-dev libudev-dev \ libasound2-dev \
libgles1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libibus-1.0-dev \ libdbus-1-dev \
fcitx-libs-dev libsamplerate0-dev libsndio-dev libwayland-dev \ libegl1-mesa-dev \
libxkbcommon-dev wayland-protocols libgl1-mesa-dev \
libgles2-mesa-dev \
libglu1-mesa-dev \
libibus-1.0-dev \
libpulse-dev \
libsdl2-2.0-0 \
libsndio-dev \
libudev-dev \
libwayland-dev \
libwayland-client++0 \
wayland-scanner++ \
libwayland-cursor++0 \
libx11-dev \
libxcursor-dev \
libxext-dev \
libxi-dev \
libxinerama-dev \
libxkbcommon-dev \
libxrandr-dev \
libxss-dev \
libxt-dev \
libxv-dev \
libxxf86vm-dev \
libdrm-dev \
libgbm-dev\
libpulse-dev
ENTRYPOINT ["/entry"] ENTRYPOINT ["/entry"]

View file

@ -4,8 +4,5 @@ set -euf -o pipefail
cd /src cd /src
rm -rf build rm -rf build
mkdir build cmake -B build -GNinja
cd build cmake --build build/
../configure --prefix=/io
make -j$(nproc)
make install