Skip to content

Commit a24924c

Browse files
myk002myk002
authored
Merge branch 'develop' into add_library_time_class
2 parents d56a9c2 + 959157b commit a24924c

File tree

356 files changed

+18564
-16885
lines changed

Some content is hidden

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

356 files changed

+18564
-16885
lines changed

‎.github/release_template.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#### Q: How do I download DFHack?
2-
**A:** Either add to your Steam library from our [Steam page](https://store.steampowered.com/app/2346660/DFHack) or scroll to the latest release on our [GitHub releases page](https://github.com/DFHack/dfhack/releases), expand the "Assets" list, and download the file for your platform (e.g. `dfhack-XX.XX-rX-Windows-64bit.zip`.
2+
**A:** Either add to your Steam library from our [Steam page](https://store.steampowered.com/app/2346660/DFHack) or scroll to the latest release on our [GitHub releases page](https://github.com/DFHack/dfhack/releases), expand the "Assets" list, and download the file for your platform (e.g. `dfhack-XX.XX-rX-Windows-64bit.zip`. If you are on Windows and are manually installing from the zip file, please remember to right click on the file after downloading, open the file properties, and select the "Unblock" checkbox. This will prevent issues with Windows antivirus programs.
33

44
-------------
55

@@ -54,7 +54,7 @@ If you see a tool complaining about the lack of a cursor, know that it's referri
5454

5555
</details>
5656

57-
Generated release notes
57+
Changelog
5858
====================
5959

6060
<details>

‎.github/workflows/build-linux.yml‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@ name: Build linux64
33
on:
44
workflow_call:
55
inputs:
6+
dfhack_repo:
7+
type: string
8+
default: DFHack/dfhack
69
dfhack_ref:
710
type: string
11+
scripts_repo:
12+
type: string
13+
default: DFHack/scripts
814
scripts_ref:
915
type: string
16+
structures_repo:
17+
type: string
18+
default: DFHack/df-structures
1019
structures_ref:
1120
type: string
1221
artifact-name:
@@ -23,6 +32,9 @@ on:
2332
platform-files:
2433
type: boolean
2534
default: true
35+
plugins:
36+
type: boolean
37+
default: true
2638
common-files:
2739
type: boolean
2840
default: true
@@ -35,6 +47,9 @@ on:
3547
stonesense:
3648
type: boolean
3749
default: false
50+
launchdf:
51+
type: boolean
52+
default: false
3853
extras:
3954
type: boolean
4055
default: false
@@ -70,31 +85,39 @@ jobs:
7085
run: sudo apt-get install libgl-dev
7186
- name: Install doc dependencies
7287
if: inputs.docs
73-
run: pip install 'sphinx<4.4.0'
88+
run: pip install 'sphinx'
7489
- name: Clone DFHack
75-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
7691
with:
77-
repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
92+
repository: ${{ inputs.dfhack_repo }}
7893
ref: ${{ inputs.dfhack_ref }}
7994
submodules: true
8095
fetch-depth: ${{ !inputs.platform-files && 1 || 0 }}
8196
- name: Clone scripts
8297
if: inputs.scripts_ref
83-
uses: actions/checkout@v3
98+
uses: actions/checkout@v4
8499
with:
85-
repository: ${{ inputs.scripts_ref && github.repository || 'DFHack/scripts' }}
100+
repository: ${{ inputs.scripts_repo }}
86101
ref: ${{ inputs.scripts_ref }}
87102
path: scripts
88103
- name: Clone structures
89104
if: inputs.structures_ref
90-
uses: actions/checkout@v3
105+
uses: actions/checkout@v4
91106
with:
92-
repository: ${{ inputs.structures_ref && github.repository || 'DFHack/df-structures' }}
107+
repository: ${{ inputs.structures_repo }}
93108
ref: ${{ inputs.structures_ref }}
94109
path: library/xml
110+
- name: Get 3rd party SDKs
111+
if: inputs.launchdf
112+
uses: actions/checkout@v4
113+
with:
114+
repository: DFHack/3rdparty
115+
ref: main
116+
ssh-key: ${{ secrets.DFHACK_3RDPARTY_TOKEN }}
117+
path: depends/steam
95118
- name: Fetch ccache
96119
if: inputs.platform-files
97-
uses: actions/cache/restore@v3
120+
uses: actions/cache/restore@v4
98121
with:
99122
path: ~/.cache/ccache
100123
key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
@@ -115,8 +138,9 @@ jobs:
115138
${{ inputs.platform-files && '-DCMAKE_C_COMPILER_LAUNCHER=ccache' || '' }} \
116139
${{ inputs.platform-files && '-DCMAKE_CXX_COMPILER_LAUNCHER=ccache' || '' }} \
117140
-DBUILD_LIBRARY:BOOL=${{ inputs.platform-files }} \
118-
-DBUILD_PLUGINS:BOOL=${{ inputs.platform-files }} \
141+
-DBUILD_PLUGINS:BOOL=${{ inputs.platform-files && inputs.plugins }} \
119142
-DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} \
143+
-DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} \
120144
-DBUILD_DEV_PLUGINS:BOOL=${{ inputs.extras }} \
121145
-DBUILD_SIZECHECK:BOOL=${{ inputs.extras }} \
122146
-DBUILD_SKELETON:BOOL=${{ inputs.extras }} \
@@ -142,7 +166,7 @@ jobs:
142166
ccache --zero-stats
143167
- name: Save ccache
144168
if: inputs.platform-files && !inputs.cache-readonly
145-
uses: actions/cache/save@v3
169+
uses: actions/cache/save@v4
146170
with:
147171
path: ~/.cache/ccache
148172
key: linux-gcc-${{ inputs.gcc-ver }}-${{ inputs.cache-id }}-${{ github.sha }}
@@ -162,7 +186,7 @@ jobs:
162186
tar cjf ../../${{ steps.artifactname.outputs.name }}.tar.bz2 .
163187
- name: Upload artifact
164188
if: inputs.artifact-name
165-
uses: actions/upload-artifact@v3
189+
uses: actions/upload-artifact@v4
166190
with:
167191
name: ${{ steps.artifactname.outputs.name }}
168192
path: ${{ steps.artifactname.outputs.name }}.tar.bz2

‎.github/workflows/build-windows.yml‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@ name: Build win64
33
on:
44
workflow_call:
55
inputs:
6+
dfhack_repo:
7+
type: string
8+
default: DFHack/dfhack
69
dfhack_ref:
710
type: string
11+
scripts_repo:
12+
type: string
13+
default: DFHack/scripts
814
scripts_ref:
915
type: string
16+
structures_repo:
17+
type: string
18+
default: DFHack/df-structures
1019
structures_ref:
1120
type: string
1221
artifact-name:
@@ -56,37 +65,37 @@ jobs:
5665
sudo apt-get update
5766
sudo apt-get install ccache
5867
- name: Clone DFHack
59-
uses: actions/checkout@v3
68+
uses: actions/checkout@v4
6069
with:
61-
repository: ${{ inputs.dfhack_ref && github.repository || 'DFHack/dfhack' }}
70+
repository: ${{ inputs.dfhack_repo }}
6271
ref: ${{ inputs.dfhack_ref }}
6372
submodules: true
6473
fetch-depth: 0
6574
- name: Clone scripts
6675
if: inputs.scripts_ref
67-
uses: actions/checkout@v3
76+
uses: actions/checkout@v4
6877
with:
69-
repository: ${{ inputs.scripts_ref && github.repository || 'DFHack/scripts' }}
78+
repository: ${{ inputs.scripts_repo }}
7079
ref: ${{ inputs.scripts_ref }}
7180
path: scripts
7281
- name: Clone structures
7382
if: inputs.structures_ref
74-
uses: actions/checkout@v3
83+
uses: actions/checkout@v4
7584
with:
76-
repository: ${{ inputs.structures_ref && github.repository || 'DFHack/df-structures' }}
85+
repository: ${{ inputs.structures_repo }}
7786
ref: ${{ inputs.structures_ref }}
7887
path: library/xml
7988
- name: Get 3rd party SDKs
8089
if: inputs.launchdf
81-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
8291
with:
8392
repository: DFHack/3rdparty
8493
ref: main
8594
ssh-key: ${{ secrets.DFHACK_3RDPARTY_TOKEN }}
8695
path: depends/steam
8796
- name: Fetch ccache
8897
if: inputs.platform-files
89-
uses: actions/cache/restore@v3
98+
uses: actions/cache/restore@v4
9099
with:
91100
path: build/win64-cross/ccache
92101
key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
@@ -109,7 +118,7 @@ jobs:
109118
ccache -d win64-cross/ccache --zero-stats
110119
- name: Save ccache
111120
if: inputs.platform-files && !inputs.cache-readonly
112-
uses: actions/cache/save@v3
121+
uses: actions/cache/save@v4
113122
with:
114123
path: build/win64-cross/ccache
115124
key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
@@ -129,7 +138,7 @@ jobs:
129138
tar cjf ../../../${{ steps.artifactname.outputs.name }}.tar.bz2 .
130139
- name: Upload artifact
131140
if: inputs.artifact-name
132-
uses: actions/upload-artifact@v3
141+
uses: actions/upload-artifact@v4
133142
with:
134143
name: ${{ steps.artifactname.outputs.name }}
135144
path: ${{ steps.artifactname.outputs.name }}.tar.bz2

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ jobs:
66
test:
77
uses: ./.github/workflows/test.yml
88
with:
9+
dfhack_repo: ${{ github.repository }}
910
dfhack_ref: ${{ github.ref }}
1011
secrets: inherit
1112

1213
package:
1314
uses: ./.github/workflows/package.yml
1415
with:
16+
dfhack_repo: ${{ github.repository }}
1517
dfhack_ref: ${{ github.ref }}
1618
secrets: inherit
1719

1820
docs:
1921
uses: ./.github/workflows/build-linux.yml
2022
with:
23+
dfhack_repo: ${{ github.repository }}
2124
dfhack_ref: ${{ github.ref }}
2225
platform-files: false
2326
common-files: false
@@ -27,6 +30,7 @@ jobs:
2730
lint:
2831
uses: ./.github/workflows/lint.yml
2932
with:
33+
dfhack_repo: ${{ github.repository }}
3034
dfhack_ref: ${{ github.ref }}
3135
secrets: inherit
3236

‎.github/workflows/clean-cache.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: Cleanup
1616
run: |
1717
gh extension install actions/gh-actions-cache

0 commit comments

Comments
 (0)