Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 20 additions & 34 deletions .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,35 @@ on:
push:
branches: [ master ]
paths:
- '.github/workflows/main_ci.yml'
- 'cmake/**'
- 'include/**'
- 'src/**'
- 'CMakeLists.txt'
- 'CMakePresets.json'
- 'vcpkg.json'
- ".github/workflows/main_ci_xmake.yml"
- "include/**"
- "src/**"
- "xmake.lua"
- "xmake-extra.lua"
pull_request:
branches: [ master ]
workflow_dispatch:

env:
BUILD_TYPE: Debug
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg-cache

jobs:
windows:
build-xmake:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
mode:
- debug
- release
steps:
- uses: actions/checkout@v4
with:
path: main

- name: Setup vcpkg
run: |
mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
cd $env:VCPKG_INSTALLATION_ROOT
./bootstrap-vcpkg.bat
./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt
- name: Checkout
uses: actions/checkout@v4

- name: Cache vcpkg
uses: actions/cache@v4
id: vcpkg-cache
env:
cache-name: vcpkg-cache
- name: Setup XMake
uses: xmake-io/github-action-setup-xmake@v1
with:
path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}/*
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }}
xmake-version: "latest"

- name: Configure CMake
working-directory: ${{ github.workspace }}/main
run: cmake --preset vs2022-windows-vcpkg
- name: Configure
run: xmake config -y --mode=${{ matrix.mode }}

- name: Build
working-directory: ${{ github.workspace }}/main
run: cmake --build build --config ${{ env.BUILD_TYPE }}
run: xmake build -y -vD
38 changes: 0 additions & 38 deletions .github/workflows/main_ci_xmake.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format -style=file -i

- name: Glob files
run: python ${{ github.workspace }}/res/scripts/cmake_generate.py
run: python ${{ github.workspace }}/res/scripts/generate_headers.py

- uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
152 changes: 0 additions & 152 deletions CMakeLists.txt

This file was deleted.

72 changes: 0 additions & 72 deletions CMakePresets.json

This file was deleted.

1 change: 0 additions & 1 deletion include/OBSE/API.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ namespace OBSE
bool trampoline{ false };
std::size_t trampolineSize{ 0 };
bool hook{ true };
bool iddb{ false };
};

void Init(const PreLoadInterface* a_intfc, InitInfo a_info = {}) noexcept;
Expand Down
Loading