Skip to content

Commit 0c07358

Browse files
committed
don't search for path
1 parent b73bb4f commit 0c07358

File tree

1 file changed

+10
-49
lines changed

1 file changed

+10
-49
lines changed

.github/workflows/cmake-test.yml

Lines changed: 10 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -97,76 +97,37 @@ jobs:
9797
echo "::add-matcher::.github/cmake-problem-matcher.json"
9898
cmake --build --parallel --preset ${{ matrix.variant }}
9999
100-
101100
- run: ctest --output-on-failure --preset ${{ matrix.variant }}
102101

103-
- name: Set the value
104-
id: step_one
105-
run: |
106-
echo "action_state=yellow" >> "$GITHUB_ENV"
107-
108-
- name: Use the value
109-
id: step_two
110-
run: |
111-
printf '%s\n' "$action_state" # This will output 'yellow'
112-
113-
- name: Locate binary (non-windows)
114-
if: ${{ matrix.variant == 'Release' && matrix.os != 'windows' }}
115-
id: locate
116-
run: |
117-
# Find the built executable
118-
BINARY=$(find build -type f -name "firestarr" ${{ case ( matrix.os == 'macos', '-perm +111', '-executable' ) }} | head -1)
119-
if [ -z "$BINARY" ]; then
120-
echo "ERROR: Could not find firestarr binary"
121-
find build -type f ${{ case ( matrix.os == 'macos', '-perm +111', '-executable' ) }}
122-
exit 1
123-
fi
124-
echo "binary=$BINARY" >> "$GITHUB_ENV"
125-
echo "Found binary at: $BINARY"
126-
127-
- name: Locate binary (windows)
128-
if: ${{ matrix.variant == 'Release' && matrix.os == 'windows' }}
129-
id: locate-windows
130-
run: |
131-
$BINARY = Get-ChildItem -Path build -Recurse -Filter "firestarr.exe" | Select-Object -First 1 -ExpandProperty FullName
132-
if (-not $BINARY) {
133-
echo "ERROR: Could not find firestarr.exe"
134-
Get-ChildItem -Path build -Recurse -Filter "*.exe" | Select-Object FullName
135-
exit 1
136-
}
137-
echo "binary=$BINARY" >> "$GITHUB_ENV"
138-
echo "Found binary at: $BINARY"
139-
shell: pwsh
140-
141-
- run: ${{ env.binary }} -h
102+
- run: ./firestarr -h
142103

143-
- run: ${{ env.binary }} . 2024-06-03 58.81228184403946 -122.9117103995713 01:00 --ffmc 89.9 --dmc 59.5 --dc 450.9 --apcp_prev 0 -v --wx ./test/input/10N_50651/firestarr_10N_50651_wx.csv --output_date_offsets [1] --tz -5 --raster-root ./test/input/10N_50651/ --perim ./test/input/10N_50651/10N_50651.tif
104+
- run: ./firestarr . 2024-06-03 58.81228184403946 -122.9117103995713 01:00 --ffmc 89.9 --dmc 59.5 --dc 450.9 --apcp_prev 0 -v --wx ./test/input/10N_50651/firestarr_10N_50651_wx.csv --output_date_offsets [1] --tz -5 --raster-root ./test/input/10N_50651/ --perim ./test/input/10N_50651/10N_50651.tif
144105

145106
- name: Check binary dependencies (non-windows)
146107
if: ${{ matrix.variant == 'Release' && matrix.os != 'windows' }}
147108
run: |
148109
echo "=== Binary info ==="
149-
file ${{ env.binary }}
110+
file ./firestarr
150111
echo ""
151112
echo "=== Dynamic dependencies ==="
152-
${{ case ( matrix.os == 'macos', 'otool -L', 'ldd' ) }} ${{ env.binary }} || true
113+
${{ case ( matrix.os == 'macos', 'otool -L', 'ldd' ) }} ./firestarr || true
153114
154115
- name: Check binary dependencies (windows)
155116
if: ${{ matrix.variant == 'Release' && matrix.os == 'windows' }}
156117
run: |
157118
echo "=== Binary info ==="
158-
Get-Item "${{ env.binary }}" | Format-List Name, Length, LastWriteTime
119+
Get-Item "./firestarr" | Format-List Name, Length, LastWriteTime
159120
echo ""
160121
echo "=== Binary size ==="
161-
(Get-Item "${{ env.binary }}").Length / 1MB | ForEach-Object { "{0:N2} MB" -f $_ }
122+
(Get-Item "./firestarr").Length / 1MB | ForEach-Object { "{0:N2} MB" -f $_ }
162123
shell: pwsh
163124

164125
- name: Package artifact (non-windows)
165126
if: ${{ matrix.variant == 'Release' && matrix.os != 'windows' }}
166127
run: |
167128
mkdir -p dist
168129
cp README.md LICENSE ORIGIN.md dist/
169-
cp ${{ env.binary }} dist/firestarr
130+
cp ./firestarr dist/firestarr
170131
171132
# Bundle data files if they exist
172133
[ -f fuel.lut ] && cp fuel.lut dist/
@@ -176,7 +137,7 @@ jobs:
176137
[ -f data/settings.ini ] && cp data/settings.ini dist/
177138
178139
# Create version info
179-
${{ env.binary }} -h | head -n1 > dist/VERSION
140+
./firestarr -h | head -n1 > dist/VERSION
180141
181142
# List contents
182143
echo "=== Package contents ==="
@@ -192,7 +153,7 @@ jobs:
192153
193154
# Including these is a requirement
194155
Copy-Item @("README.md", "LICENSE", "ORIGIN.md") dist\
195-
Copy-Item "${{ env.binary }}" dist\firestarr.exe
156+
Copy-Item "./firestarr" dist\firestarr.exe
196157
197158
# Copy required DLLs from vcpkg depending on variant
198159
copy @((Get-ChildItem -Recurse vcpkg\packages\*.dll).FullName | Select-String ${{ case( matrix.variant == 'Debug', '', '-notMatch' ) }} debug | Select-String bin ) dist\
@@ -205,7 +166,7 @@ jobs:
205166
if (Test-Path data\settings.ini) { Copy-Item data\settings.ini dist\ }
206167
207168
# Create version info
208-
${{ env.binary }} | select -first 1 | Out-File -FilePath dist/VERSION -Encoding utf8
169+
./firestarr | select -first 1 | Out-File -FilePath dist/VERSION -Encoding utf8
209170
210171
# List contents
211172
echo "=== Package contents ==="

0 commit comments

Comments
 (0)