Skip to content

Commit dfd25fa

Browse files
committed
Install SFML via vcpkg and simplify CI steps
Standardize CI step names and simplify vcpkg installs by replacing feature-specific targets (sfml[graphics,window,system]:x64-... ) with the plain sfml:x64-* packages for Windows, Linux and macOS. Also remove a redundant comment about DLL copying. These changes simplify the workflow and rely on the default SFML package configuration in vcpkg.
1 parent 86ec367 commit dfd25fa

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
}
4747
}
4848
49-
- name: Install SFML (vcpkg x64-windows)
49+
- name: Install SFML via vcpkg (Windows)
5050
shell: pwsh
5151
run: |
5252
$env:VCPKG_ROOT = "${{ runner.temp }}\vcpkg"
5353
$vcpkg = Join-Path $env:VCPKG_ROOT "vcpkg.exe"
5454
$attempt = 0
5555
while ($true) {
5656
try {
57-
& $vcpkg install sfml[graphics,window,system]:x64-windows
57+
& $vcpkg install sfml:x64-windows
5858
break
5959
} catch {
6060
$attempt++
@@ -79,7 +79,6 @@ jobs:
7979
Remove-Item -Recurse -Force $out -ErrorAction SilentlyContinue
8080
New-Item -ItemType Directory -Path $out | Out-Null
8181
Copy-Item -Path "build\bin\Release\*" -Destination $out -Recurse -Force -ErrorAction SilentlyContinue
82-
# if dlls are alongside build\bin, copy them as well
8382
if (Test-Path "build\bin") {
8483
Copy-Item -Path "build\bin\*" -Destination $out -Recurse -Force -ErrorAction SilentlyContinue
8584
}
@@ -114,10 +113,10 @@ jobs:
114113
cd "$VCPKG_ROOT"
115114
./bootstrap-vcpkg.sh || (sleep 5 && ./bootstrap-vcpkg.sh) || (sleep 10 && ./bootstrap-vcpkg.sh)
116115
117-
- name: Install SFML (vcpkg x64-linux)
116+
- name: Install SFML via vcpkg (Linux)
118117
run: |
119118
export VCPKG_ROOT="${RUNNER_TEMP}/vcpkg"
120-
"$VCPKG_ROOT/vcpkg" install sfml[graphics,window,system]:x64-linux
119+
"$VCPKG_ROOT/vcpkg" install sfml:x64-linux
121120
122121
- name: Configure CMake (Linux)
123122
run: |
@@ -164,10 +163,10 @@ jobs:
164163
cd "$VCPKG_ROOT"
165164
./bootstrap-vcpkg.sh || (sleep 5 && ./bootstrap-vcpkg.sh) || (sleep 10 && ./bootstrap-vcpkg.sh)
166165
167-
- name: Install SFML (vcpkg x64-osx)
166+
- name: Install SFML via vcpkg (macOS)
168167
run: |
169168
VCPKG_ROOT="${RUNNER_TEMP}/vcpkg"
170-
"$VCPKG_ROOT/vcpkg" install sfml[graphics,window,system]:x64-osx
169+
"$VCPKG_ROOT/vcpkg" install sfml:x64-osx
171170
172171
- name: Configure CMake (macOS)
173172
run: |

0 commit comments

Comments
 (0)