Skip to content

Commit 243c115

Browse files
authored
Merge pull request #17 from cortex-command-community/ci/workflow-refactors
2 parents b35688a + 9b4d6fd commit 243c115

File tree

3 files changed

+16
-49
lines changed

3 files changed

+16
-49
lines changed

.github/actions/bundle_release/action.yaml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,27 @@ runs:
1717
- name: Compress Windows Release
1818
shell: bash
1919
run: |
20-
zip -j CortexCommand.windows.zip \
21-
"release/Cortex Command.exe" \
20+
zip --must-match -j CortexCommand.windows.zip \
21+
"release/Cortex Command.exe/Cortex Command.exe" \
2222
external/lib/win/{fmod,SDL2}.dll
2323
2424
- name: Compress Linux Release
2525
shell: bash
2626
run: |
27-
zip -j CortexCommand.linux.zip \
27+
zip --must-match -j CortexCommand.linux.zip \
2828
"release/CortexCommand (Linux)/CortexCommand.AppImage" \
2929
external/lib/linux/x86_64/libfmod.so*
3030
3131
- name: Compress OSX Release
3232
shell: bash
3333
run: |
34-
zip -j CortexCommand.macos.zip \
35-
"release/CortexCommand (macOS)/CortexCommand" \
34+
zip --must-match -j CortexCommand.macos.zip \
35+
"release/CortexCommand (macOS)/CortexCommand.tar" \
3636
external/lib/macos/libfmod.dylib
3737
3838
- name: Package Data files
3939
shell: bash
4040
run: |
41-
zip -r -u CortexCommand.windows.zip Data
42-
zip -r -u CortexCommand.linux.zip Data
43-
zip -r -u CortexCommand.macos.zip Data
44-
45-
46-
47-
48-
41+
zip --must-match -r -u CortexCommand.windows.zip Data
42+
zip --must-match -r -u CortexCommand.linux.zip Data
43+
zip --must-match -r -u CortexCommand.macos.zip Data

.github/workflows/nightly.yaml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535
fi
3636
3737
- name: Checkout code
38-
if: !steps.check_manual_run.outputs.needs_build
38+
if: ${{ !steps.check_manual_run.outputs.needs_build }}
3939
uses: actions/checkout@v3
4040

4141
- name: fetch tags
42-
if: !steps.check_manual_run.outputs.needs_build
42+
if: ${{ !steps.check_manual_run.outputs.needs_build }}
4343
run: git fetch --tags origin
4444

4545
- name: Check if tags point to the same commit or if the workflow was manually triggered
46-
if: !steps.check_manual_run.outputs.needs_build
46+
if: ${{ !steps.check_manual_run.outputs.needs_build }}
4747
id: check_tags
4848
run: |
4949
curr_sha=$(git rev-parse HEAD)
@@ -70,6 +70,8 @@ jobs:
7070
uses: ./.github/workflows/meson.yml
7171
with:
7272
upload_artefacts: true
73+
build_type: "debug"
74+
debug_level: "release"
7375

7476
build-msbuild-releases:
7577
name: Windows Release Build
@@ -80,6 +82,7 @@ jobs:
8082
uses: ./.github/workflows/msbuild.yml
8183
with:
8284
upload_artefacts: true
85+
build_configuration: "Debug Release"
8386

8487
release:
8588
name: Publish Release
@@ -94,38 +97,8 @@ jobs:
9497
- name: fetch tags
9598
run: git fetch --tags origin
9699

97-
- run: mkdir release
98-
99-
- name: Download build artefacts
100-
uses: actions/download-artifact@v3
101-
with:
102-
path: release
103-
104-
- run: ls -R release
105-
106-
- name: Compress Windows Release
107-
run: |
108-
zip -j CortexCommand.windows.zip \
109-
"release/Cortex Command.exe" \
110-
external/lib/win/{fmod,SDL2}.dll
111-
112-
- name: Compress Linux Release
113-
run: |
114-
zip -j CortexCommand.linux.zip \
115-
"release/CortexCommand (Linux)/CortexCommand.AppImage" \
116-
external/lib/linux/x86_64/libfmod.so*
117-
118-
- name: Compress OSX Release
119-
run: |
120-
zip -j CortexCommand.macos.zip \
121-
"release/CortexCommand (macOS)/CortexCommand" \
122-
external/lib/macos/libfmod.dylib
123-
124-
- name: Package Data files
125-
run: |
126-
zip -r -u CortexCommand.windows.zip Data
127-
zip -r -u CortexCommand.linux.zip Data
128-
zip -r -u CortexCommand.macos.zip Data
100+
- name: Bundle Release Assets
101+
uses: ./.github/actions/bundle_release
129102

130103
- name: Get Date
131104
id: get_date

.vscode/tasks.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"env": {
3636
"CC": "gcc-12",
3737
"CXX": "g++-12",
38-
"CXX_LD": "g++-12"
3938
}
4039
}
4140
}

0 commit comments

Comments
 (0)