Skip to content

Commit 813bb24

Browse files
walbournwalbourn
authored
Minor edits for GitHub Actions (#208)
1 parent cfc2a2d commit 813bb24

10 files changed

+137
-87
lines changed

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ updates:
33
- package-ecosystem: github-actions
44
directory: /
55
schedule:
6-
interval: daily
6+
interval: weekly

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ jobs:
9999
timeout-minutes: 10
100100
name: 'Test'
101101
working-directory: ${{ github.workspace }}
102-
run: ctest --preset=${{ matrix.build_type }}
102+
run: ctest --preset=${{ matrix.build_type }} --output-on-failure

‎build/DirectXMath-GitHub-CMake-Dev17.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ resources:
3131
type: git
3232
ref: refs/heads/main
3333
trigger: none
34+
- repository: testRepo
35+
name: walbourn/directxmathtest
36+
type: github
37+
endpoint: microsoft
38+
ref: refs/heads/main
3439

3540
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3641

@@ -39,7 +44,6 @@ variables:
3944
VS_GENERATOR: 'Visual Studio 17 2022'
4045
WIN10_SDK: '10.0.19041.0'
4146
WIN11_SDK: '10.0.22000.0'
42-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
4347

4448
pool:
4549
vmImage: windows-2022
@@ -52,10 +56,14 @@ jobs:
5256
- checkout: self
5357
clean: true
5458
fetchTags: false
55-
- task: CmdLine@2
59+
fetchDepth: 1
60+
path: 's'
61+
- checkout: testRepo
5662
displayName: Fetch Tests
57-
inputs:
58-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
63+
clean: true
64+
fetchTags: false
65+
fetchDepth: 1
66+
path: 's/Tests'
5967
- task: CMake@1
6068
displayName: 'CMake (MSVC): Config x64'
6169
inputs:

‎build/DirectXMath-GitHub-CMake.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,18 @@ resources:
4040
- repository: self
4141
type: git
4242
ref: refs/heads/main
43+
- repository: testRepo
44+
name: walbourn/directxmathtest
45+
type: github
46+
endpoint: microsoft
47+
ref: refs/heads/main
4348

4449
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
4550

4651
variables:
4752
Codeql.Enabled: false
4853
VS_GENERATOR: 'Visual Studio 16 2019'
4954
WIN10_SDK: '10.0.19041.0'
50-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
5155

5256
pool:
5357
vmImage: windows-2019
@@ -60,10 +64,14 @@ jobs:
6064
- checkout: self
6165
clean: true
6266
fetchTags: false
63-
- task: CmdLine@2
67+
fetchDepth: 1
68+
path: 's'
69+
- checkout: testRepo
6470
displayName: Fetch Tests
65-
inputs:
66-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
71+
clean: true
72+
fetchTags: false
73+
fetchDepth: 1
74+
path: 's/Tests'
6775
- task: CMake@1
6876
displayName: CMake (MSVC x64)
6977
inputs:

‎build/DirectXMath-GitHub-Dev17.yml

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ resources:
2727
- repository: self
2828
type: git
2929
ref: refs/heads/main
30+
- repository: testRepo
31+
name: walbourn/directxmathtest
32+
type: github
33+
endpoint: microsoft
34+
ref: refs/heads/main
3035

3136
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3237

@@ -36,7 +41,6 @@ pool:
3641
variables:
3742
Codeql.Enabled: false
3843
VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
39-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
4044

4145
jobs:
4246
- job: BUILD_DEV17
@@ -46,17 +50,14 @@ jobs:
4650
- checkout: self
4751
clean: true
4852
fetchTags: false
49-
- task: DeleteFiles@1
50-
displayName: Delete files from Tests
51-
inputs:
52-
SourceFolder: Tests
53-
Contents: '**'
54-
RemoveSourceFolder: true
55-
RemoveDotFiles: true
56-
- task: CmdLine@2
53+
fetchDepth: 1
54+
path: 's'
55+
- checkout: testRepo
5756
displayName: Fetch Tests
58-
inputs:
59-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
57+
clean: true
58+
fetchTags: false
59+
fetchDepth: 1
60+
path: 's/Tests'
6061
- task: VSBuild@1
6162
displayName: Build solution math3_2022.sln x86dbg
6263
inputs:
@@ -339,19 +340,14 @@ jobs:
339340
- checkout: self
340341
clean: true
341342
fetchTags: false
342-
- task: DeleteFiles@1
343-
displayName: Delete files from Tests
344-
inputs:
345-
SourceFolder: Tests
346-
Contents: '**'
347-
RemoveSourceFolder: true
348-
RemoveDotFiles: true
349-
- task: CmdLine@2
343+
fetchDepth: 1
344+
path: 's'
345+
- checkout: testRepo
350346
displayName: Fetch Tests
351-
inputs:
352-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
353-
workingDirectory: $(Build.SourcesDirectory)
354-
failOnStderr: true
347+
clean: true
348+
fetchTags: false
349+
fetchDepth: 1
350+
path: 's/Tests'
355351
- task: CmdLine@2
356352
displayName: Setup environment for CMake to use VS
357353
inputs:
@@ -417,19 +413,14 @@ jobs:
417413
- checkout: self
418414
clean: true
419415
fetchTags: false
420-
- task: DeleteFiles@1
421-
displayName: Delete files from Tests
422-
inputs:
423-
SourceFolder: Tests
424-
Contents: '**'
425-
RemoveSourceFolder: true
426-
RemoveDotFiles: true
427-
- task: CmdLine@2
416+
fetchDepth: 1
417+
path: 's'
418+
- checkout: testRepo
428419
displayName: Fetch Tests
429-
inputs:
430-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
431-
workingDirectory: $(Build.SourcesDirectory)
432-
failOnStderr: true
420+
clean: true
421+
fetchTags: false
422+
fetchDepth: 1
423+
path: 's/Tests'
433424
- task: CmdLine@2
434425
displayName: Setup environment for CMake to use VS
435426
inputs:

‎build/DirectXMath-GitHub-MinGW.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ resources:
4141
- repository: self
4242
type: git
4343
ref: refs/heads/main
44+
- repository: testRepo
45+
name: walbourn/directxmathtest
46+
type: github
47+
endpoint: microsoft
48+
ref: refs/heads/main
4449

4550
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
4651

@@ -49,7 +54,6 @@ pool:
4954

5055
variables:
5156
Codeql.Enabled: false
52-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
5357
URL_MINGW32: https://github.com/brechtsanders/winlibs_mingw/releases/download/12.2.0-14.0.6-10.0.0-ucrt-r2/winlibs-i686-posix-dwarf-gcc-12.2.0-llvm-14.0.6-mingw-w64ucrt-10.0.0-r2.zip
5458
HASH_MINGW32: 'fcd1e11b896190da01c83d5b5fb0d37b7c61585e53446c2dab0009debc3915e757213882c35e35396329338de6f0222ba012e23a5af86932db45186a225d1272'
5559

@@ -60,11 +64,14 @@ jobs:
6064
- checkout: self
6165
clean: true
6266
fetchTags: false
63-
- task: CmdLine@2
67+
fetchDepth: 1
68+
path: 's'
69+
- checkout: testRepo
6470
displayName: Fetch Tests
65-
inputs:
66-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
67-
workingDirectory: $(Build.SourcesDirectory)
71+
clean: true
72+
fetchTags: false
73+
fetchDepth: 1
74+
path: 's/Tests'
6875
- task: PowerShell@2
6976
displayName: Install MinGW32
7077
inputs:
@@ -123,16 +130,19 @@ jobs:
123130
cmakeArgs: --build out3
124131

125132
- job: MINGW64_BUILD
126-
displayName: 'Minimalist GNU for Windows (MinGW-W64) BUILD_TESTING=ON'
133+
displayName: 'Minimalist GNU for Windows (MinGW-W64)'
127134
steps:
128135
- checkout: self
129136
clean: true
130137
fetchTags: false
131-
- task: CmdLine@2
138+
fetchDepth: 1
139+
path: 's'
140+
- checkout: testRepo
132141
displayName: Fetch Tests
133-
inputs:
134-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
135-
workingDirectory: $(Build.SourcesDirectory)
142+
clean: true
143+
fetchTags: false
144+
fetchDepth: 1
145+
path: 's/Tests'
136146
- task: CmdLine@2
137147
displayName: GCC version
138148
inputs:

‎build/DirectXMath-GitHub-WSL-11.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ resources:
3131
type: git
3232
ref: refs/heads/main
3333
trigger: none
34+
- repository: testRepo
35+
name: walbourn/directxmathtest
36+
type: github
37+
endpoint: microsoft
38+
ref: refs/heads/main
3439

3540
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3641

@@ -39,7 +44,6 @@ pool:
3944

4045
variables:
4146
Codeql.Enabled: false
42-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
4347

4448
jobs:
4549
- job: BUILD_WSL
@@ -48,10 +52,14 @@ jobs:
4852
- checkout: self
4953
clean: true
5054
fetchTags: false
51-
- task: CmdLine@2
52-
displayName: Fetch tests
53-
inputs:
54-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
55+
fetchDepth: 1
56+
path: 's'
57+
- checkout: testRepo
58+
displayName: Fetch Tests
59+
clean: true
60+
fetchTags: false
61+
fetchDepth: 1
62+
path: 's/Tests'
5563
- task: CMake@1
5664
displayName: DirectXMath Tests
5765
inputs:

‎build/DirectXMath-GitHub-WSL.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ resources:
4141
- repository: self
4242
type: git
4343
ref: refs/heads/main
44+
- repository: testRepo
45+
name: walbourn/directxmathtest
46+
type: github
47+
endpoint: microsoft
48+
ref: refs/heads/main
4449

4550
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
4651

@@ -49,7 +54,6 @@ pool:
4954

5055
variables:
5156
Codeql.Enabled: false
52-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
5357

5458
jobs:
5559
- job: BUILD_WSL
@@ -58,10 +62,14 @@ jobs:
5862
- checkout: self
5963
clean: true
6064
fetchTags: false
61-
- task: CmdLine@2
62-
displayName: Fetch tests
63-
inputs:
64-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
65+
fetchDepth: 1
66+
path: 's'
67+
- checkout: testRepo
68+
displayName: Fetch Tests
69+
clean: true
70+
fetchTags: false
71+
fetchDepth: 1
72+
path: 's/Tests'
6573
- task: CMake@1
6674
displayName: DirectXMath Tests
6775
inputs:

‎build/DirectXMath-GitHub.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ resources:
2727
- repository: self
2828
type: git
2929
ref: refs/heads/main
30+
- repository: testRepo
31+
name: walbourn/directxmathtest
32+
type: github
33+
endpoint: microsoft
34+
ref: refs/heads/main
3035

3136
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
3237

@@ -35,7 +40,6 @@ pool:
3540

3641
variables:
3742
Codeql.Enabled: false
38-
GITHUB_PAT: $(GITHUBPUBLICTOKEN)
3943

4044
jobs:
4145
- job: BUILD_DEV16
@@ -45,17 +49,14 @@ jobs:
4549
- checkout: self
4650
clean: true
4751
fetchTags: false
48-
- task: DeleteFiles@1
49-
displayName: Delete files from Tests
50-
inputs:
51-
SourceFolder: Tests
52-
Contents: '**'
53-
RemoveSourceFolder: true
54-
RemoveDotFiles: true
55-
- task: CmdLine@2
52+
fetchDepth: 1
53+
path: 's'
54+
- checkout: testRepo
5655
displayName: Fetch Tests
57-
inputs:
58-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
56+
clean: true
57+
fetchTags: false
58+
fetchDepth: 1
59+
path: 's/Tests'
5960
- task: VSBuild@1
6061
displayName: Build solution math3_2019.sln x86dbg
6162
inputs:
@@ -329,10 +330,14 @@ jobs:
329330
- checkout: self
330331
clean: true
331332
fetchTags: false
332-
- task: CmdLine@2
333+
fetchDepth: 1
334+
path: 's'
335+
- checkout: testRepo
333336
displayName: Fetch Tests
334-
inputs:
335-
script: git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/directxmathtest.git Tests
337+
clean: true
338+
fetchTags: false
339+
fetchDepth: 1
340+
path: 's/Tests'
336341
- task: VSBuild@1
337342
displayName: Build solution math3_2017.sln x86dbg
338343
inputs:

0 commit comments

Comments
 (0)