Skip to content

Commit

Permalink
building dependencies with vcpkg on Linux (#1724)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfomin authored Jun 6, 2024
1 parent e81db0a commit e4ec2ab
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 131 deletions.
23 changes: 1 addition & 22 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Linux GCC
os: ubuntu-24.04
compiler: gcc
extra-options: -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
extra-options: -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF
shell: bash

- name: macOS Clang
Expand Down Expand Up @@ -109,27 +109,6 @@ jobs:
cd build
cpack
- name: Upload AppImage
if: runner.os == 'Linux'
uses: actions/upload-artifact@v4
with:
name: Woof-AppImage
path: build/*.appimage

- name: Extract Version Number
if: ${{ contains(github.ref, 'tags') && runner.os == 'Linux' }}
shell: bash
run: echo "VERSION=${GITHUB_REF##*_}" >> $GITHUB_ENV

- name: Release
if: ${{ contains(github.ref, 'tags') && runner.os == 'Linux' }}
uses: ncipollo/release-action@v1
with:
name: Woof! ${{ env.VERSION }}
bodyFile: CHANGELOG.md
allowUpdates: true
artifacts: build/*.appimage

linter:
name: ${{ matrix.name }}
runs-on: ubuntu-24.04
Expand Down
130 changes: 130 additions & 0 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: Build Packages

on:
push:
branches: [ master ]
tags: ['*']
paths-ignore: ['**.md']
pull_request:
branches: [ master ]
paths-ignore: ['**.md']
workflow_dispatch:

env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"

jobs:
build:
name: ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}

strategy:
matrix:
config:
- name: Linux GCC
os: ubuntu-22.04
triplet: x64-linux-dynamic-release
artifact-name: AppImage
artifact-path: build/*.appimage

- name: MSVC x64
os: windows-latest
arch: x64
triplet: x64-windows-static-release
artifact-name: Win-64
artifact-path: build/*.zip

- name: MSVC x86
os: windows-latest
arch: x86
triplet: x86-windows-static-release
artifact-name: Win-32
artifact-path: build/*.zip

steps:
- uses: actions/checkout@v4

- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo sed -i 's/# deb-src/deb-src/' /etc/apt/sources.list
sudo apt-get update
sudo apt-get install ninja-build
sudo apt-get build-dep libsdl2-dev
- name: Developer Command Prompt
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ matrix.config.arch }}

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Configure (Linux)
if: runner.os == 'Linux'
shell: bash
run: |
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DENABLE_WERROR=ON -DENABLE_HARDENING=ON -DENABLE_LTO=ON \
-DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
-DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" \
-DVCPKG_TARGET_TRIPLET=${{ matrix.config.triplet }} \
-DCMAKE_INSTALL_PREFIX=/usr
- name: Configure (Windows)
if: runner.os == 'Windows'
run: |
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release `
-DENABLE_WERROR=ON -DENABLE_LTO=ON `
-DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" `
-DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" `
-DVCPKG_TARGET_TRIPLET=${{ matrix.config.triplet }} `
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
-DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
- name: Build
run: cmake --build build --config "Release"

- name: Test
if: github.event_name == 'workflow_dispatch'
run: |
cd demotest
pip install pyyaml joblib
python demotest --jobs 4 --port ../build/src/woof
- name: Package (Linux)
if: runner.os == 'Linux'
run: |
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${{ github.workspace }}/build/vcpkg_installed/${{ matrix.config.triplet }}/lib"
cd build
cpack
- name: Package (Windows)
if: runner.os == 'Windows'
run: |
cd build
cpack
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.config.artifact-name }}
path: ${{ matrix.config.artifact-path }}

- name: Extract Version Number
shell: bash
run: echo "VERSION=${GITHUB_REF##*_}" >> $GITHUB_ENV

- name: Release
if: ${{ contains(github.ref, 'tags') }}
uses: ncipollo/release-action@v1
with:
name: Woof! ${{ env.VERSION }}
bodyFile: CHANGELOG.md
allowUpdates: true
artifacts: ${{ matrix.config.artifact-path }}
107 changes: 0 additions & 107 deletions .github/workflows/win_msvc.yml

This file was deleted.

9 changes: 9 additions & 0 deletions cmake/triplets/x64-linux-dynamic-release.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Linux)

set(VCPKG_FIXUP_ELF_RPATH ON)

set(VCPKG_BUILD_TYPE release)
32 changes: 30 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"dependencies": [
"sdl2",
{
"name": "sdl2",
"features": [
{
"name": "vulkan",
"platform": "linux"
},
{
"name": "wayland",
"platform": "linux"
},
{
"name": "x11",
"platform": "linux"
},
{
"name": "ibus",
"platform": "linux"
}
]
},
"sdl2-net",
"openal-soft",
{
"name": "openal-soft",
"features": [
{
"name": "pipewire",
"platform": "linux"
}
]
},
"libsndfile",
{
"name": "fluidsynth",
Expand Down

0 comments on commit e4ec2ab

Please sign in to comment.