Skip to content

Commit 32cfa36

Browse files
committed
Simplify test-install-scripts workflow
1 parent bf4acf3 commit 32cfa36

1 file changed

Lines changed: 18 additions & 64 deletions

File tree

.github/workflows/test-install-scripts.yaml

Lines changed: 18 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,12 @@ jobs:
1616
matrix:
1717
include:
1818
- os: ubuntu-latest
19-
expected_platform: linux
2019
- os: macos-latest
21-
expected_platform: macos
2220

2321
steps:
2422
- uses: actions/checkout@v6
2523

26-
- name: Test install script syntax and functions
27-
shell: bash
28-
run: |
29-
cd packaging/install
30-
chmod +x geodepot-install.sh
31-
32-
# Test help output
33-
./geodepot-install.sh --help > /dev/null
34-
echo "✓ Help output works"
35-
36-
# Test platform resolution by sourcing the script and calling functions directly
37-
echo "Testing platform resolution..."
38-
platform=$(sh -c '. ./geodepot-install.sh; resolve_platform')
39-
if [ "$platform" != "${{ matrix.expected_platform }}" ]; then
40-
echo "✗ Platform detection failed: expected '${{ matrix.expected_platform }}', got '$platform'"
41-
exit 1
42-
fi
43-
echo "✓ Platform detection works: $platform"
44-
45-
# Test architecture resolution
46-
echo "Testing architecture resolution..."
47-
arch=$(sh -c '. ./geodepot-install.sh; resolve_arch')
48-
if [ -z "$arch" ] || [ "$arch" != "x86_64" ] && [ "$arch" != "arm64" ]; then
49-
echo "✗ Architecture detection failed: got '$arch'"
50-
exit 1
51-
fi
52-
echo "✓ Architecture detection works: $arch"
53-
54-
- name: Test actual install from GitHub release
24+
- name: Test actual install from GitHub release 1.1.0
5525
shell: bash
5626
run: |
5727
cd packaging/install
@@ -69,27 +39,20 @@ jobs:
6939
--no-wrapper
7040
7141
# Verify installation
72-
case "${{ matrix.os }}" in
73-
ubuntu-latest)
74-
PLATFORM="linux"
75-
ARCH="x86_64"
76-
EXECUTABLE="geodepot"
77-
;;
78-
macos-latest)
79-
PLATFORM="macos"
80-
ARCH="arm64"
81-
EXECUTABLE="geodepot"
82-
;;
83-
esac
84-
8542
BUNDLE_DIR="$INSTALL_DIR/releases/1.1.0/geodepot"
8643
if [ -d "$BUNDLE_DIR" ]; then
8744
echo "✓ Bundle directory created"
88-
if [ -f "$BUNDLE_DIR/$EXECUTABLE" ]; then
45+
if [ -f "$BUNDLE_DIR/geodepot" ]; then
8946
echo "✓ Geodepot executable found"
9047
# Try to run it
91-
chmod +x "$BUNDLE_DIR/$EXECUTABLE"
92-
"$BUNDLE_DIR/$EXECUTABLE" --help > /dev/null 2>&1 && echo "✓ Geodepot executable works" || echo "✗ Geodepot executable failed"
48+
chmod +x "$BUNDLE_DIR/geodepot"
49+
"$BUNDLE_DIR/geodepot" --help > /dev/null 2>&1
50+
if [ $? -eq 0 ]; then
51+
echo "✓ Geodepot executable works"
52+
else
53+
echo "✗ Geodepot executable failed"
54+
exit 1
55+
fi
9356
else
9457
echo "✗ Geodepot executable not found in $BUNDLE_DIR"
9558
ls -la "$BUNDLE_DIR/" || true
@@ -109,21 +72,7 @@ jobs:
10972
steps:
11073
- uses: actions/checkout@v6
11174

112-
- name: Test install script syntax
113-
shell: pwsh
114-
run: |
115-
cd packaging/install
116-
117-
# Test help output - just run the script to see if it parses correctly
118-
try {
119-
.\geodepot-install.ps1 -Version "test" -NoWrapper -NoPathUpdate -ErrorAction SilentlyContinue 2>&1 | Out-Null
120-
Write-Host "✓ Script syntax is valid"
121-
} catch {
122-
Write-Host "✗ Script syntax error: $_"
123-
exit 1
124-
}
125-
126-
- name: Test actual install from GitHub release
75+
- name: Test actual install from GitHub release 1.1.0
12776
shell: pwsh
12877
run: |
12978
cd packaging/install
@@ -146,8 +95,13 @@ jobs:
14695
if (Test-Path (Join-Path $BUNDLE_DIR "geodepot.cmd")) {
14796
Write-Host "✓ Geodepot executable found"
14897
# Try to run it
149-
& (Join-Path $BUNDLE_DIR "geodepot.cmd") --help *>&1 | Out-Null
150-
Write-Host "✓ Geodepot executable works"
98+
$result = & (Join-Path $BUNDLE_DIR "geodepot.cmd") --help 2>&1
99+
if ($LASTEXITCODE -eq 0) {
100+
Write-Host "✓ Geodepot executable works"
101+
} else {
102+
Write-Host "✗ Geodepot executable failed: $result"
103+
exit 1
104+
}
151105
} else {
152106
Write-Host "✗ Geodepot executable not found"
153107
Get-ChildItem $BUNDLE_DIR -Recurse

0 commit comments

Comments
 (0)