Skip to content

Commit 6af5fa5

Browse files
NicksWorldNicksWorld
committed
Further testing
1 parent 5b1a3d7 commit 6af5fa5

File tree

2 files changed

+77
-72
lines changed

2 files changed

+77
-72
lines changed

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

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,22 @@ jobs:
117117
# restore-keys: |
118118
# win-msvc-${{ inputs.cache-id }}
119119
# win-msvc
120+
- uses: ilammy/msvc-dev-cmd@v1
120121
- name: Configure DFHack
121122
env:
122123
CMAKE_EXTRA_ARGS: -DBUILD_PDBS:BOOL=${{ inputs.cache-id == 'release' }} -DDFHACK_RUN_URL='https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' -DBUILD_LIBRARY=${{ inputs.platform-files }} -DBUILD_PLUGINS:BOOL=${{ inputs.platform-files && inputs.plugins }} -DBUILD_STONESENSE:BOOL=${{ inputs.stonesense }} -DBUILD_DOCS:BOOL=${{ inputs.docs }} -DBUILD_DOCS_NO_HTML:BOOL=${{ !inputs.html }} -DINSTALL_DATA_FILES:BOOL=${{ inputs.common-files }} -DINSTALL_SCRIPTS:BOOL=${{ inputs.common-files }} -DBUILD_DFLAUNCH:BOOL=${{ inputs.launchdf }} -DBUILD_TESTS:BOOL=${{ inputs.tests }} -DBUILD_XMLDUMP:BOOL=${{ inputs.xml-dump-type-sizes }} ${{ inputs.xml-dump-type-sizes && '-DINSTALL_XMLDUMP:BOOL=1' || '' }}
123124
CC: cl
124125
CXX: cl
125126
run: |
127+
mkdir -p /output
126128
cmake -S . `
127129
-B build `
128-
-DCMAKE_BUILD_ARCH=64 `
130+
-GNinja `
131+
-DDFHACK_BUILD_ARCH=64 `
129132
-DCMAKE_BUILD_TYPE=Release `
130-
${CMAKE_EXTRA_ARGS}
133+
-DBUILD_DOCS=1 `
134+
-DCMAKE_INSTALL_PREFIX=/output `
135+
$CMAKE_EXTRA_ARGS
131136
- name: Build DFHack
132137
run: |
133138
cmake --build build
@@ -145,26 +150,26 @@ jobs:
145150
# with:
146151
# path: build/win64-cross/ccache
147152
# key: win-msvc-${{ inputs.cache-id }}-${{ github.sha }}
148-
# - name: Format artifact name
149-
# if: inputs.artifact-name
150-
# id: artifactname
151-
# run: |
152-
# if test "false" = "${{ inputs.append-date-and-hash }}"; then
153-
# echo name=${{ inputs.artifact-name }} >> $GITHUB_OUTPUT
154-
# else
155-
# echo name=${{ inputs.artifact-name }}-$(date +%Y%m%d)-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
156-
# fi
157-
# - name: Prep artifact
158-
# if: inputs.artifact-name
159-
# run: |
160-
# cd build/win64-cross/output
161-
# tar cjf ../../../${{ steps.artifactname.outputs.name }}.tar.bz2 .
162-
# - name: Upload artifact
163-
# if: inputs.artifact-name
164-
# uses: actions/upload-artifact@v4
165-
# with:
166-
# name: ${{ steps.artifactname.outputs.name }}
167-
# path: ${{ steps.artifactname.outputs.name }}.tar.bz2
153+
- name: Format artifact name
154+
if: inputs.artifact-name
155+
id: artifactname
156+
run: |
157+
if test "false" = "${{ inputs.append-date-and-hash }}"; then
158+
echo name=${{ inputs.artifact-name }} >> $GITHUB_OUTPUT
159+
else
160+
echo name=${{ inputs.artifact-name }}-$(date +%Y%m%d)-$(git rev-parse --short HEAD) >> $GITHUB_OUTPUT
161+
fi
162+
- name: Prep artifact
163+
if: inputs.artifact-name
164+
run: |
165+
cd /output
166+
tar cjf /${{ steps.artifactname.outputs.name }}.tar.bz2 .
167+
- name: Upload artifact
168+
if: inputs.artifact-name
169+
uses: actions/upload-artifact@v4
170+
with:
171+
name: ${{ steps.artifactname.outputs.name }}
172+
path: /${{ steps.artifactname.outputs.name }}.tar.bz2
168173
# - name: Upload PDBs
169174
# if: inputs.artifact-name && inputs.cache-id == 'release'
170175
# uses: actions/upload-artifact@v4

‎.github/workflows/test.yml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,33 @@ jobs:
3636
html: false
3737
tests: true
3838

39-
build-linux:
40-
name: Linux gcc-${{ matrix.gcc }}
41-
uses: ./.github/workflows/build-linux.yml
42-
with:
43-
dfhack_repo: ${{ inputs.dfhack_repo }}
44-
dfhack_ref: ${{ inputs.dfhack_ref }}
45-
scripts_repo: ${{ inputs.scripts_repo }}
46-
scripts_ref: ${{ inputs.scripts_ref }}
47-
structures_repo: ${{ inputs.structures_repo }}
48-
structures_ref: ${{ inputs.structures_ref }}
49-
artifact-name: test-gcc-${{ matrix.gcc }}
50-
cache-id: test
51-
stonesense: ${{ matrix.plugins == 'all' }}
52-
extras: ${{ matrix.plugins == 'all' }}
53-
docs: true
54-
html: false
55-
tests: true
56-
gcc-ver: ${{ matrix.gcc }}
57-
secrets: inherit
58-
strategy:
59-
fail-fast: false
60-
matrix:
61-
include:
62-
- gcc: 11 # baseline compatibility with ubuntu LTS 22.04
63-
plugins: "default"
64-
- gcc: 12 # highest available in ubuntu 22.04
65-
plugins: "all"
39+
# build-linux:
40+
# name: Linux gcc-${{ matrix.gcc }}
41+
# uses: ./.github/workflows/build-linux.yml
42+
# with:
43+
# dfhack_repo: ${{ inputs.dfhack_repo }}
44+
# dfhack_ref: ${{ inputs.dfhack_ref }}
45+
# scripts_repo: ${{ inputs.scripts_repo }}
46+
# scripts_ref: ${{ inputs.scripts_ref }}
47+
# structures_repo: ${{ inputs.structures_repo }}
48+
# structures_ref: ${{ inputs.structures_ref }}
49+
# artifact-name: test-gcc-${{ matrix.gcc }}
50+
# cache-id: test
51+
# stonesense: ${{ matrix.plugins == 'all' }}
52+
# extras: ${{ matrix.plugins == 'all' }}
53+
# docs: true
54+
# html: false
55+
# tests: true
56+
# gcc-ver: ${{ matrix.gcc }}
57+
# secrets: inherit
58+
# strategy:
59+
# fail-fast: false
60+
# matrix:
61+
# include:
62+
# - gcc: 11 # baseline compatibility with ubuntu LTS 22.04
63+
# plugins: "default"
64+
# - gcc: 12 # highest available in ubuntu 22.04
65+
# plugins: "all"
6666

6767
test-windows:
6868
name: Run Windows test suite
@@ -88,26 +88,26 @@ jobs:
8888
plugins: default
8989
config: empty
9090

91-
test-linux:
92-
name: Run Linux test suite
93-
needs: build-linux
94-
uses: ./.github/workflows/test-suite.yml
95-
with:
96-
dfhack_repo: ${{ inputs.dfhack_repo }}
97-
dfhack_ref: ${{ inputs.dfhack_ref }}
98-
os: ubuntu
99-
compiler: gcc-11
100-
plugins: default
101-
config: default
102-
103-
test-linux-gcc-12-all-plugins:
104-
name: Run Linux test suite (gcc-12, all plugins)
105-
needs: build-linux
106-
uses: ./.github/workflows/test-suite.yml
107-
with:
108-
dfhack_repo: ${{ inputs.dfhack_repo }}
109-
dfhack_ref: ${{ inputs.dfhack_ref }}
110-
os: ubuntu
111-
compiler: gcc-12
112-
plugins: all
113-
config: default
91+
# test-linux:
92+
# name: Run Linux test suite
93+
# needs: build-linux
94+
# uses: ./.github/workflows/test-suite.yml
95+
# with:
96+
# dfhack_repo: ${{ inputs.dfhack_repo }}
97+
# dfhack_ref: ${{ inputs.dfhack_ref }}
98+
# os: ubuntu
99+
# compiler: gcc-11
100+
# plugins: default
101+
# config: default
102+
#
103+
# test-linux-gcc-12-all-plugins:
104+
# name: Run Linux test suite (gcc-12, all plugins)
105+
# needs: build-linux
106+
# uses: ./.github/workflows/test-suite.yml
107+
# with:
108+
# dfhack_repo: ${{ inputs.dfhack_repo }}
109+
# dfhack_ref: ${{ inputs.dfhack_ref }}
110+
# os: ubuntu
111+
# compiler: gcc-12
112+
# plugins: all
113+
# config: default

0 commit comments

Comments
 (0)