Skip to content

Commit cc4d2da

Browse files
committed
Additional cmake cleanup and new features, script updates
1 parent 6d63ede commit cc4d2da

25 files changed

+1482
-525
lines changed

.github/workflows/test-build-cmake-windows.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
windows-cmake:
1414
name: Build on Windows
1515
runs-on: windows-latest
16+
# Reminder default is PowerShell runner, not DOS, unless otherwise specified.
1617
timeout-minutes: 20
1718

1819
strategy:
@@ -40,13 +41,7 @@ jobs:
4041

4142
# Lock down network/runner
4243
# See https://github.com/step-security/harden-runner/releases
43-
- uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a
44-
with:
45-
egress-policy: block
46-
allowed-endpoints: >
47-
developer.arm.com,
48-
armkeil.blob.core.windows.net,
49-
github.com, objects.githubusercontent.com, api.github.com
44+
# Currently only supported on Ubuntu
5045

5146
# ARM GCC toolchain (adds the bin dir to PATH)
5247
- name: Set up ARM none-eabi GCC 14.x
@@ -57,42 +52,58 @@ jobs:
5752

5853
# CMake + Ninja are preinstalled on windows-latest, but verify & print versions
5954
- name: Tool versions
60-
shell: bash
55+
shell: cmd
6156
run: |
62-
# Show some key toolchain versions
57+
:: Show some key toolchain versions
6358
6459
echo "Compiler versions:"
6560
arm-none-eabi-gcc --version
66-
echo
61+
echo ""
6762
echo "CMake:"
6863
cmake --version
6964
echo
7065
echo "Ninja:"
7166
ninja --version
7267
echo
73-
echo "MSVC (via vswhere):"
74-
cmd.exe /c "\"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe\" -latest -products * -requires Microsoft.Component.MSBuild -property installationVersion"
68+
::echo "MSVC (via vswhere):"
69+
::"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationVersion
70+
echo
71+
echo "VS2022 Properties"
72+
"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products *
73+
echo
74+
75+
- name: List all environment variables
76+
run: |
77+
# Show environment settings
78+
79+
echo "All environment settings"
80+
# set
81+
# Get-ChildItem Env: | Sort-Object Name
82+
$env:path -split ";"
83+
84+
# Get-ChildItem -Path 'C:\' -Filter stdint.h -Recurse -ErrorAction SilentlyContinue
85+
7586
7687
- name: List Presets
77-
shell: bash
88+
shell: cmd
7889
run: |
7990
# Check available presets in CMakePresets.json
8091
8192
cmake -S . -B build-list --list-presets=configure
8293
8394
- name: Configure Preset "${{ matrix.target }}"
84-
shell: bash
95+
shell: cmd
8596
run: |
8697
# cmake runs in git bash
8798
8899
cmake --preset "${{ matrix.target }}"
89100
echo "Configured: ${{ matrix.target }}"
90101
91102
- name: Build "${{ matrix.target }}"
92-
shell: bash
103+
shell: cmd
93104
run: |
94105
# cmake runs in git bash
95-
BUILD_DIR="build-${{ matrix.target }}"
106+
# BUILD_DIR="build-${{ matrix.target }}"
96107
cmake --build "build-${{ matrix.target }}" --parallel
97108
98109
# Optional: show interesting artifacts

0 commit comments

Comments
 (0)