Skip to content

Commit bae3873

Browse files
committed
WIP: fix finding dist/VERSION and including other files
1 parent cedecd6 commit bae3873

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

.github/workflows/cmake-test-on.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ jobs:
149149
cp ${{ steps.locate-macos.outputs.binary }} dist/firestarr
150150
151151
# Bundle data files if they exist
152-
[ -f firestarr/fuel.lut ] && cp firestarr/fuel.lut dist/
153-
[ -f firestarr/settings.ini ] && cp firestarr/settings.ini dist/
154-
[ -f firestarr/data/fuel.lut ] && cp firestarr/data/fuel.lut dist/
155-
[ -f firestarr/data/settings.ini ] && cp firestarr/data/settings.ini dist/
152+
[ -f fuel.lut ] && cp fuel.lut dist/
153+
[ -f settings.ini ] && cp settings.ini dist/
154+
[ -f data/fuel.lut ] && cp data/fuel.lut dist/
155+
[ -f data/settings.ini ] && cp data/settings.ini dist/
156156
157157
# Create version info
158-
cd firestarr && git rev-parse HEAD > ../dist/VERSION && cd ..
158+
./firestarr -h | head -n1 > dist/VERSION
159159
160160
# List contents
161161
echo "=== Package contents ==="
@@ -171,13 +171,13 @@ jobs:
171171
cp ${{ steps.locate-linux.outputs.binary }} dist/firestarr
172172
173173
# Bundle data files if they exist
174-
[ -f firestarr/fuel.lut ] && cp firestarr/fuel.lut dist/
175-
[ -f firestarr/settings.ini ] && cp firestarr/settings.ini dist/
176-
[ -f firestarr/data/fuel.lut ] && cp firestarr/data/fuel.lut dist/
177-
[ -f firestarr/data/settings.ini ] && cp firestarr/data/settings.ini dist/
174+
[ -f fuel.lut ] && cp fuel.lut dist/
175+
[ -f settings.ini ] && cp settings.ini dist/
176+
[ -f data/fuel.lut ] && cp data/fuel.lut dist/
177+
[ -f data/settings.ini ] && cp data/settings.ini dist/
178178
179179
# Create version info
180-
cd firestarr && git rev-parse HEAD > ../dist/VERSION && cd ..
180+
./firestarr -h | head -n1 > dist/VERSION
181181
182182
# List contents
183183
echo "=== Package contents ==="
@@ -206,9 +206,7 @@ jobs:
206206
if (Test-Path firestarr\data\settings.ini) { Copy-Item firestarr\data\settings.ini dist\ }
207207
208208
# Create version info
209-
cd firestarr
210-
git rev-parse HEAD | Out-File -FilePath ..\dist\VERSION -Encoding utf8
211-
cd ..
209+
.\firestarr.exe | select -first 1 | Out-File -FilePath dist/VERSION -Encoding utf8
212210
213211
# List contents
214212
echo "=== Package contents ==="

0 commit comments

Comments
 (0)