mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

GitHub actions: Automate i386-linux-gnu release 

Also updates aarch64 to be basically the same as the i386 one.
pull/6052/head
Gleb Mazovetskiy 3 years ago
parent
eac35f4377
commit
ae99697cfc
5 changed files with 104 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      .github/workflows/Linux_aarch64.yml
  2. 71
      .github/workflows/Linux_x86.yml
  3. 1
      CMake/platforms/i386-linux-gnu-pkg-config
  4. 55
      CMake/platforms/linux_i386.toolchain.cmake
  5. 10
      Packaging/nix/debian-cross-i386-prep.sh

26
.github/workflows/Linux_aarch64.yml
Unescape View File

@ -1,4 +1,4 @@
name: Linux AArch64 name: Linux AArch64 (aarch64-linux-gnu)
on: on:
push: push:
@ -36,44 +36,52 @@ jobs:
sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7 sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
Packaging/nix/debian-cross-aarch64-prep.sh Packaging/nix/debian-cross-aarch64-prep.sh
- name: Cache CMake build folder
uses: actions/cache@v3
with:
path: build
key: ${{ github.workflow }}-v1-${{ github.sha }}
restore-keys: ${{ github.workflow }}-v1-
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
shell: bash shell: bash
env: env:
CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}} CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently. # We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions.
run: | run: |
cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/aarch64-linux-gnu.toolchain.cmake \ cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/aarch64-linux-gnu.toolchain.cmake \
-DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \ -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
-DDEVILUTIONX_SYSTEM_LIBFMT=OFF && \ -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
- name: Package - name: Package
run: Packaging/nix/LinuxReleasePackaging.sh && mv devilutionx.tar.xz devilutionx-aarch64.tar.xz run: Packaging/nix/LinuxReleasePackaging.sh && mv devilutionx.tar.xz devilutionx-aarch64-linux-gnu.tar.xz
# AppImage cross-packaging is not implemented yet. # AppImage cross-packaging is not implemented yet.
# - name: Package AppImage # - name: Package AppImage
# run: Packaging/nix/AppImage.sh && mv devilutionx.appimage devilutionx-aarch64.appimage # run: Packaging/nix/AppImage.sh && mv devilutionx.appimage devilutionx-aarch64-linux-gnu.appimage
- name: Upload Package - name: Upload Package
if: ${{ !env.ACT }} if: ${{ !env.ACT }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: devilutionx-aarch64.tar.xz name: devilutionx-aarch64-linux-gnu.tar.xz
path: devilutionx-aarch64.tar.xz path: devilutionx-aarch64-linux-gnu.tar.xz
# AppImage cross-packaging is not implemented yet. # AppImage cross-packaging is not implemented yet.
# - name: Upload AppImage # - name: Upload AppImage
# if: ${{ !env.ACT }} # if: ${{ !env.ACT }}
# uses: actions/upload-artifact@v3 # uses: actions/upload-artifact@v3
# with: # with:
# name: devilutionx-aarch64.appimage # name: devilutionx-aarch64-linux-gnu.appimage
# path: devilutionx-aarch64.appimage # path: devilutionx-aarch64-linux-gnu.appimage
- name: Update Release - name: Update Release
if: ${{ github.event_name == 'release' && !env.ACT }} if: ${{ github.event_name == 'release' && !env.ACT }}
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
with: with:
file: devilutionx-aarch64.* file: devilutionx-aarch64-linux-gnu.*
file_glob: true file_glob: true
overwrite: true overwrite: true

71
.github/workflows/Linux_x86.yml
Unescape View File

@ -1,4 +1,4 @@
name: Linux x86 name: Linux x86 (i386-linux-gnu)
on: on:
push: push:
@ -7,9 +7,14 @@ on:
paths-ignore: paths-ignore:
- '*.md' - '*.md'
pull_request: pull_request:
types: [ opened, synchronize ] types: [opened, synchronize]
paths-ignore: paths-ignore:
- '*.md' - '*.md'
release:
types: [published]
paths-ignore:
- '*.md'
workflow_dispatch:
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
@ -17,7 +22,7 @@ concurrency:
jobs: jobs:
build: build:
runs-on: ubuntu-22.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -25,41 +30,59 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Create Build Environment - name: Create Build Environment
run: > run: |
sudo dpkg --add-architecture i386 && # Work around the somewhat broken packages in the GitHub Actions Ubuntu 20.04 image.
sudo apt-get update -y && # https://github.com/actions/runner-images/issues/4620#issuecomment-981333260
sudo apt-get install -y cmake file g++-multilib git libfmt-dev:i386 libsdl2-dev:i386 libsodium-dev:i386 libpng-dev:i386 libbz2-dev:i386 rpm wget smpq sudo apt-get -y install --allow-downgrades libpcre2-8-0=10.34-7
Packaging/nix/debian-cross-i386-prep.sh
- name: Cache CMake build folder - name: Cache CMake build folder
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: build path: build
key: ${{ github.workflow }}-v1-${{ github.sha }} key: ${{ github.workflow }}-v2-${{ github.sha }}
restore-keys: ${{ github.workflow }}-v1- restore-keys: ${{ github.workflow }}-v2-
- name: Configure CMake
shell: bash
working-directory: ${{github.workspace}}
run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=OFF -DCPACK=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake
- name: Build - name: Build
working-directory: ${{github.workspace}} working-directory: ${{github.workspace}}
shell: bash shell: bash
run: cmake --build build -j $(nproc) --target package env:
CMAKE_BUILD_TYPE: ${{github.event_name == 'release' && 'Release' || 'RelWithDebInfo'}}
# We set DEVILUTIONX_SYSTEM_LIBFMT=OFF because its soversion changes frequently.
# We set DEVILUTIONX_SYSTEM_SIMPLEINI=OFF because we require v4.19+, still missing from many distributions,
# and there is no libsimpleini-dev:i386 for Ubuntu 20.04.
run: |
cmake -S. -Bbuild -DCMAKE_TOOLCHAIN_FILE=../CMake/platforms/linux_i386.toolchain.cmake \
-DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=/usr -DCPACK=ON \
-DBUILD_TESTING=OFF -DDEVILUTIONX_SYSTEM_LIBFMT=OFF -DDEVILUTIONX_SYSTEM_SIMPLEINI=OFF && \
cmake --build build -j $(getconf _NPROCESSORS_ONLN) --target package
- name: Package - name: Package
run: Packaging/nix/LinuxReleasePackaging.sh && Packaging/nix/AppImage.sh run: Packaging/nix/LinuxReleasePackaging.sh && mv devilutionx.tar.xz devilutionx-i386-linux-gnu.tar.xz
- name: Upload-Package # AppImage cross-packaging is not implemented yet.
# - name: Package AppImage
# run: Packaging/nix/AppImage.sh && mv devilutionx.appimage devilutionx-i386-linux-gnu.appimage
- name: Upload Package
if: ${{ !env.ACT }} if: ${{ !env.ACT }}
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: devilutionx_linux_x86.tar.xz name: devilutionx-i386-linux-gnu.tar.xz
path: devilutionx.tar.xz path: devilutionx-i386-linux-gnu.tar.xz
- name: Upload-AppImage # AppImage cross-packaging is not implemented yet.
if: ${{ !env.ACT }} # - name: Upload AppImage
uses: actions/upload-artifact@v3 # if: ${{ !env.ACT }}
# uses: actions/upload-artifact@v3
# with:
# name: devilutionx-i386-linux-gnu.appimage
# path: devilutionx-i386-linux-gnu.appimage
- name: Update Release
if: ${{ github.event_name == 'release' && !env.ACT }}
uses: svenstaro/upload-release-action@v2
with: with:
name: devilutionx_linux_x86.appimage file: devilutionx-i386-linux-gnu.*
path: devilutionx.appimage file_glob: true
overwrite: true

1
CMake/platforms/i386-linux-gnu-pkg-config
Unescape View File

@ -0,0 +1 @@
debian-cross-pkg-config.sh

55
CMake/platforms/linux_i386.toolchain.cmake
Unescape View File

@ -1,26 +1,29 @@
message(STATUS "Using 32-bit toolchain") message(STATUS "Using 32-bit toolchain")
set(CMAKE_CXX_FLAGS -m32 CACHE STRING "") set(CMAKE_CXX_FLAGS -m32 CACHE STRING "")
set(CMAKE_C_FLAGS -m32 CACHE STRING "") set(CMAKE_C_FLAGS -m32 CACHE STRING "")
# Affects pkg-config # Affects pkg-config
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE) set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
# Used by pkg-config on Debian # Used by pkg-config on Debian
set(CMAKE_LIBRARY_ARCHITECTURE i386-linux-gnu) set(CMAKE_LIBRARY_ARCHITECTURE i386-linux-gnu)
# Silly hack required to get the pkg-config path code to activate # Silly hack required to get the pkg-config path code to activate
list(APPEND CMAKE_PREFIX_PATH /usr) list(APPEND CMAKE_PREFIX_PATH /usr)
# Find where 32-bit CMake modules are stored # Find where 32-bit CMake modules are stored
find_path(DIR NAMES cmake PATHS /usr/lib32 /usr/lib/i386-linux-gnu NO_DEFAULT_PATH) find_path(DIR NAMES cmake PATHS /usr/lib32 /usr/lib/i386-linux-gnu NO_DEFAULT_PATH)
if(DIR) if(DIR)
message(STATUS "Using 32-bit libraries from ${DIR}") message(STATUS "Using 32-bit libraries from ${DIR}")
# Read CMake modules from 32-bit packages # Read CMake modules from 32-bit packages
# set(CMAKE_FIND_ROOT_PATH ${DIR}) # set(CMAKE_FIND_ROOT_PATH ${DIR})
# set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
# set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) # set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
# set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) # set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
endif() endif()
# 32-bit NASM set(PKG_CONFIG_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/i386-linux-gnu-pkg-config" CACHE STRING "Path to pkg-config")
set(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
# 32-bit NASM
set(CMAKE_ASM_NASM_OBJECT_FORMAT elf)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)

10
Packaging/nix/debian-cross-i386-prep.sh
Unescape View File

@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -euo pipefail
set -x
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install --ignore-hold -y \
cmake g++-multilib git smpq gettext \
libsdl2-dev:i386 libsdl2-image-dev:i386 libsodium-dev:i386 \
libpng-dev:i386 libbz2-dev:i386 libfmt-dev:i386
Write Preview
Loading…
Cancel
Save