Skip to content

Commit fef51c5

Browse files
committed
chg: dev: update workflow actions, save updated win project files
Signed-off-by: Stephen L Arnold <sarnold@vctlabs.com>
1 parent 02bafea commit fef51c5

5 files changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/build-posix-cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
steps:
2828

2929
- name: Git Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
3333

3434
- name: Update CMake
35-
uses: jwlawson/actions-setup-cmake@v1.8
35+
uses: jwlawson/actions-setup-cmake@v2
3636

3737
- name: Install brew dependencies
3838
run: |
@@ -76,7 +76,7 @@ jobs:
7676
cmake --build build --target install
7777
7878
- name: Upload pacakge artifact
79-
uses: actions/upload-artifact@v4
79+
uses: actions/upload-artifact@v6
8080
with:
8181
name: package-cmake-${{ matrix.os }}-${{ matrix.use_namespace }}
8282
path: staging/

.github/workflows/build-posix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525

2626
- name: Git Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030

@@ -63,7 +63,7 @@ jobs:
6363
cp abc libabc.a staging/
6464
6565
- name: Upload pacakge artifact
66-
uses: actions/upload-artifact@v4
66+
uses: actions/upload-artifact@v6
6767
with:
6868
name: package-posix-${{ matrix.os }}-${{ matrix.use_namespace }}
6969
path: staging/

.github/workflows/build-windows.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
steps:
1616

1717
- name: Git Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
submodules: recursive
2121

2222
- name: Setup MSVC
23-
uses: ilammy/msvc-dev-cmd@v1
23+
uses: step-security/msvc-dev-cmd@v1
2424
with:
2525
arch: x86
2626

@@ -35,9 +35,9 @@ jobs:
3535
# Parse source files from abclib.dsp
3636
$dspContent = Get-Content "abclib.dsp" -Raw
3737
$sourceFiles = [regex]::Matches($dspContent, 'SOURCE=\.\\([^\r\n]+)') | ForEach-Object { $_.Groups[1].Value } | Sort-Object -Unique
38-
38+
3939
Write-Host "Found $($sourceFiles.Count) source files"
40-
40+
4141
# Build source file items
4242
$sourceItems = ""
4343
foreach ($src in $sourceFiles) {
@@ -49,12 +49,12 @@ jobs:
4949
$sourceItems += " <ClInclude Include=`"$src`" />`r`n"
5050
}
5151
}
52-
52+
5353
# Read template and replace placeholder
5454
$template = Get-Content ".github\scripts\abclib.vcxproj.template" -Raw
5555
$vcxproj = $template -replace '\{\{SOURCE_FILES\}\}', $sourceItems
5656
Set-Content "abclib.vcxproj" $vcxproj -NoNewline
57-
57+
5858
Write-Host "abclib.vcxproj generated successfully"
5959
6060
- name: Build
@@ -71,10 +71,12 @@ jobs:
7171
- name: Stage Executable
7272
run: |
7373
mkdir staging
74+
copy abcspace.sln staging\
75+
copy abclib.vcxproj staging\
7476
copy _TEST\abc.exe staging\
7577
7678
- name: Upload package artifact
77-
uses: actions/upload-artifact@v4
79+
uses: actions/upload-artifact@v6
7880
with:
7981
name: package-windows
80-
path: staging/
82+
path: staging/

.github/workflows/conda-dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ jobs:
6666

6767
- name: Prepare build environment for windows
6868
if: runner.os == 'Windows'
69-
uses: ilammy/msvc-dev-cmd@v1
69+
uses: step-security/msvc-dev-cmd@v1
7070
with:
71-
arch: x64
71+
arch: x86
7272

7373
- name: Env (Windows)
7474
if: runner.os == 'Windows'
@@ -78,7 +78,7 @@ jobs:
7878
7979
- name: Cache conda
8080
id: cache
81-
uses: actions/cache@v4
81+
uses: actions/cache@v5
8282
env:
8383
# Increase this value to reset cache if environment.devenv.yml has not changed
8484
CACHE_NUMBER: 2

.github/workflows/win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run:
2424
shell: msys2 {0}
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v6
2727

2828
- name: Setup MinGW native environment
2929
uses: msys2/setup-msys2@v2
@@ -58,7 +58,7 @@ jobs:
5858
- name: Test
5959
run: ctest --test-dir build --output-on-failure --parallel -V
6060

61-
- uses: actions/upload-artifact@v4
61+
- uses: actions/upload-artifact@v6
6262
if: failure()
6363
with:
6464
name: WindowsCMakeTestlog

0 commit comments

Comments
 (0)