Skip to content

Commit 8081888

Browse files
authored
Merge branch 'praydog:master' into master
2 parents cc04572 + bd13dd9 commit 8081888

123 files changed

Lines changed: 29607 additions & 448 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: windows-latest
88
strategy:
99
matrix:
10-
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS]
10+
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA, MHSTORIES3]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

.github/workflows/dev-release.yml

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,49 @@ on: [push, workflow_dispatch]
33
env:
44
BUILD_TYPE: Release
55
jobs:
6+
csharp-release:
7+
runs-on: windows-latest
8+
strategy:
9+
matrix:
10+
target: [csharp-api]
11+
steps:
12+
- name: Set up Python
13+
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c
14+
with:
15+
python-version: "3.12"
16+
17+
- name: Checkout
18+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
19+
20+
- name: Configure CMake
21+
run: cmake -S ${{github.workspace}}/csharp-api -B ${{github.workspace}}/csharp-api/build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
22+
23+
- name: Build
24+
run: cmake --build ${{github.workspace}}/csharp-api/build --config ${{env.BUILD_TYPE}} --target ALL_BUILD
25+
26+
- name: Prepare release
27+
working-directory: ${{github.workspace}}/csharp-api
28+
run: |
29+
pip install -r requirements.txt
30+
python make_symlinks.py --gamedir="${{github.workspace}}/csharp-api" --bindir="${{github.workspace}}/csharp-api/build/bin" --just_copy=True --skip_test_scripts=True
31+
32+
- name: Compress release
33+
working-directory: ${{github.workspace}}/csharp-api
34+
run: |
35+
7z a ${{github.workspace}}/${{matrix.target}}.zip reframework
36+
37+
- name: Upload artifacts
38+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
39+
with:
40+
name: ${{matrix.target}}
41+
path: ${{github.workspace}}/${{matrix.target}}.zip
42+
if-no-files-found: error
43+
644
dev-release:
745
runs-on: windows-latest
846
strategy:
947
matrix:
10-
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS]
48+
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA, MHSTORIES3]
1149
steps:
1250
- name: Checkout
1351
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -43,7 +81,7 @@ jobs:
4381

4482
nightly-push:
4583
runs-on: windows-latest
46-
needs: dev-release
84+
needs: [dev-release, csharp-release]
4785
if: github.ref == 'refs/heads/master'
4886
steps:
4987
- name: Checkout

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ cmake-build*
1313
.idea/
1414
build_vs2019_devmode_DMC5.bat
1515
src/CommitHash.autogenerated
16+
csharp-api/test/Test/bin
17+
csharp-api/test/Test/obj
18+
csharp-api/build/
19+

0 commit comments

Comments
 (0)