Skip to content

Commit a6b01cd

Browse files
committed
clean up ci a bit
some of these changes downstream never made it back up here
1 parent ba9a2d1 commit a6b01cd

File tree

4 files changed

+15
-16
lines changed

4 files changed

+15
-16
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ on: [
66
workflow_dispatch
77
]
88

9-
env:
10-
LLVM_MINGW_VERSION: llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64
11-
LLVM_MINGW_DOWNLOAD: https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-msvcrt-ubuntu-20.04-x86_64.tar.xz
12-
139
jobs:
1410
build-windows:
1511
runs-on: windows-latest
@@ -44,16 +40,13 @@ jobs:
4440
submodules: recursive
4541

4642
- name: Configure CMake
47-
working-directory: ${{ env.GITHUB_WORKSPACE }}
4843
run: cmake . --preset ${{ matrix.preset }}
4944

5045
- name: Build
51-
working-directory: ${{ env.GITHUB_WORKSPACE }}
5246
run: cmake --build out/build/${{ matrix.preset }}
5347

5448
build-ubuntu:
55-
# Require at least 24 for the mingw build
56-
runs-on: ubuntu-24.04
49+
runs-on: ubuntu-latest
5750

5851
strategy:
5952
fail-fast: false
@@ -78,6 +71,13 @@ jobs:
7871
with:
7972
submodules: recursive
8073

74+
- name: Login to GitHub Container Registry
75+
uses: docker/login-action@v2
76+
with:
77+
registry: ghcr.io
78+
username: ${{ github.repository_owner }}
79+
password: ${{ secrets.GITHUB_TOKEN }}
80+
8181
- name: Build
8282
uses: devcontainers/[email protected]
8383
with:
@@ -87,6 +87,9 @@ jobs:
8787
# The git watcher cmake thinks something's unsafe? Doesn't happen to me locally.
8888
runCmd: |
8989
git config --global --add safe.directory `pwd`
90+
91+
set -e
92+
9093
cmake . --preset ${{ matrix.toolchain.preset }} -G Ninja
9194
cmake --build out/build/${{ matrix.toolchain.preset }}
9295
@@ -106,7 +109,6 @@ jobs:
106109

107110
steps:
108111
- name: Setup Clang
109-
if: startswith(matrix.preset, 'clang')
110112
uses: egor-tensin/setup-clang@v1
111113

112114
- name: Setup CMake and Ninja
@@ -122,7 +124,6 @@ jobs:
122124
submodules: recursive
123125

124126
- name: Configure CMake
125-
working-directory: ${{ env.GITHUB_WORKSPACE }}
126127
run: cmake . --preset ${{ matrix.preset }} -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
127128

128129
- name: Remove `.modmap`s from compile commands
@@ -133,7 +134,6 @@ jobs:
133134
-Path "out\build\${{ matrix.preset }}\compile_commands.json"
134135
135136
- name: Run clang-tidy
136-
working-directory: ${{ env.GITHUB_WORKSPACE }}
137137
run: |
138138
python (Get-Command run-clang-tidy).Source `
139139
-p "out\build\${{ matrix.preset }}" `
@@ -150,7 +150,6 @@ jobs:
150150

151151
steps:
152152
- name: Setup Clang
153-
if: startswith(matrix.preset, 'clang')
154153
uses: egor-tensin/setup-clang@v1
155154

156155
- name: Checkout repository

src/unrealsdk/game/bl3/object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace unrealsdk::game {
1717

1818
namespace {
1919

20-
using construct_obj_func = UObject* (*)(UClass* cls,
20+
using construct_obj_func = UObject* (*)(UClass * cls,
2121
UObject* obj,
2222
FName name,
2323
uint32_t flags,

src/unrealsdk/unreal/classes/uproperty.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class UProperty : public UField {
119119
template <typename PropertyType,
120120
typename FieldType,
121121
typename = std::enable_if_t<std::is_base_of_v<UProperty, PropertyType>>>
122-
FieldType read_field(FieldType PropertyType::*field) const {
122+
FieldType read_field(FieldType PropertyType::* field) const {
123123
#ifdef UE4
124124
return reinterpret_cast<const PropertyType*>(this)->*field;
125125
#else

src/unrealsdk/unreal/classes/ustruct.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class UStruct : public UField {
105105
template <typename SubType,
106106
typename FieldType,
107107
typename = std::enable_if_t<std::is_base_of_v<UStruct, SubType>>>
108-
[[nodiscard]] const FieldType& get_field(FieldType SubType::*field) const {
108+
[[nodiscard]] const FieldType& get_field(FieldType SubType::* field) const {
109109
#ifdef UE4
110110
return reinterpret_cast<const SubType*>(this)->*field;
111111
#else
@@ -117,7 +117,7 @@ class UStruct : public UField {
117117
template <typename SubType,
118118
typename FieldType,
119119
typename = std::enable_if_t<std::is_base_of_v<UStruct, SubType>>>
120-
FieldType& get_field(FieldType SubType::*field) {
120+
FieldType& get_field(FieldType SubType::* field) {
121121
return const_cast<FieldType&>(const_cast<const UStruct*>(this)->get_field(field));
122122
}
123123

0 commit comments

Comments
 (0)