Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit44c1c70

Browse files
authored
ADO pipeline changes for OpenSSF Best Practices (#160)
1 parent464a656 commit44c1c70

File tree

8 files changed

+84
-76
lines changed

8 files changed

+84
-76
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
298298
elseif(CMAKE_CXX_COMPILER_IDMATCHES"MSVC")
299299
if(ENABLE_CODE_ANALYSIS)
300300
foreach(t IN LISTS TOOL_EXES ITEMS${PROJECT_NAME})
301-
target_compile_options(${t}PRIVATE /analyze)
301+
target_compile_options(${t}PRIVATE /analyze /WX)
302302
endforeach()
303303
endif()
304304

‎README.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ Sander et al. "Signal-Specialized Parametrization" Europgraphics 2002 [pdf](http
6262

6363
##Release Notes
6464

65+
FOR SECURITY ADVISORIES, see[GitHub](https://github.com/microsoft/UVAtlas/security/advisories).
66+
67+
For a full change history, see[CHANGELOG.md](https://github.com/microsoft/UVAtlas/blob/main/CHANGELOG.md).
68+
6569
* Starting with the December 2020 release, this library makes use of typed enum bitmask flags per the recommendation of the_C++ Standard_ section*17.5.2.1.3 Bitmask types*. This is consistent with Direct3D 12's use of the``DEFINE_ENUM_FLAG_OPERATORS`` macro. This may have*breaking change* impacts to client code:
6670

6771
* You cannot pass the``0`` literal as your option flags value. Instead you must make use of the appropriate default enum value:``UVATLAS_DEFAULT`` or``UVATLAS_IMT_DEFAULT``.
@@ -78,6 +82,8 @@ This project welcomes contributions and suggestions. Most contributions require
7882

7983
When you submit a pull request, a CLA bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
8084

85+
Tests for new features should also be submitted as a PR to the[Test Suite](https://github.com/walbourn/uvatlastest/wiki) repository.
86+
8187
##Code of Conduct
8288

8389
This project has adopted the[Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the[Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
@@ -86,4 +92,8 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
8692

8793
This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow[Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies.
8894

95+
#Credits
96+
97+
The UVAtlas library is the work of Xin Huang and Chuck Walbourn, with contributions from Chris Messer, Steve Schroeder, Microsoft Research China, and Team Bungie.
98+
8999
Thanks to Andrew Farrier and Scott Matloff for their on-going help with code reviews.

‎UVAtlas/UVAtlas_Windows10_2022.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<AppContainerApplication>true</AppContainerApplication>
9898
<ApplicationType>Windows Store</ApplicationType>
9999
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
100-
<WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
100+
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
101101
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
102102
</PropertyGroup>
103103
<ImportProject="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎UVAtlas/isochart/isochartengine.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ HRESULT CIsochartEngine::InitializeCurrentChartHeap()
285285
}
286286

287287
#ifdef _OPENMP
288+
#ifdef _MSC_VER
289+
#pragma warning(disable : 6993)
290+
#endif
288291
HRESULTCIsochartEngine::ParameterizeChartsInHeapParallelized(
289292
bool bFirstTime,
290293
size_t MaxChartNumber)

‎build/UVAtlas-GitHub-Dev17.yml‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,36 @@ schedules:
1212
include:
1313
-main
1414

15-
trigger:none
15+
trigger:
16+
branches:
17+
include:
18+
-main
19+
paths:
20+
exclude:
21+
-'*.md'
22+
-LICENSE
23+
-CMake*
24+
-'.nuget/*'
25+
-build/*.cmake
26+
-build/*.in
27+
-build/*.mdb
28+
-build/*.ps1
1629

1730
pr:
1831
branches:
1932
include:
2033
-main
2134
paths:
22-
include:
23-
-build/UVAtlas-GitHub-Dev17.yml
35+
exclude:
36+
-'*.md'
37+
-LICENSE
38+
-CMake*
39+
-'.nuget/*'
40+
-build/*.cmake
41+
-build/*.in
42+
-build/*.mdb
43+
-build/*.ps1
44+
drafts:false
2445

2546
resources:
2647
repositories:

‎build/UVAtlas-GitHub-Test-Dev17.yml‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ pool:
2929

3030
variables:
3131
Codeql.Enabled:false
32+
VC_PATH:'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
3233
GITHUB_PAT:$(GITHUBPUBLICTOKEN)
3334

3435
jobs:
@@ -138,20 +139,13 @@ jobs:
138139
script:git clone --quiet --no-tags https://%GITHUB_PAT%@github.com/walbourn/uvatlastest.git Tests
139140
workingDirectory:$(Build.SourcesDirectory)
140141
failOnStderr:true
141-
-task:ChocolateyCommand@0
142-
displayName:Install Ninja
143-
inputs:
144-
command:'install'
145-
installPackageId:'ninja'
146142
-task:CmdLine@2
147-
displayName:'Setup environment for CMake to use VS'
143+
displayName:Setup environment for CMake to use VS
148144
inputs:
149145
script:|
150-
@echo off
151-
pushd "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
152-
for /f "delims=" %%x in ('.\vswhere.exe -latest -property InstallationPath') do set VSPATH=%%x
153-
popd
154-
call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" x64
146+
call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
147+
echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
148+
echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
155149
echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
156150
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
157151
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
@@ -213,14 +207,10 @@ jobs:
213207
inputs:
214208
Contents:'out'
215209
-task:CmdLine@2
216-
displayName:'Set LIB for ARM64'
210+
displayName:Switch compiler to ARM64
217211
inputs:
218212
script:|
219-
@echo off
220-
pushd "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
221-
for /f "delims=" %%x in ('.\vswhere.exe -latest -property InstallationPath') do set VSPATH=%%x
222-
popd
223-
call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" arm64
213+
call "$(VC_PATH)\Auxiliary\Build\vcvarsamd64_arm64.bat"
224214
echo ##vso[task.setvariable variable=LIB;]%LIB%
225215
226216
-task:CMake@1

‎build/UVAtlas-GitHub.yml‎

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ resources:
5151

5252
name:$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
5353

54+
pool:
55+
vmImage:windows-2019
56+
5457
variables:
5558
Codeql.Enabled:false
5659
GUID_FEED:$(ADOFeedGUID)
5760

58-
pool:
59-
vmImage:windows-2022
60-
6161
jobs:
6262
-job:DESKTOP_BUILD
6363
displayName:'Win32 Desktop'
@@ -176,54 +176,3 @@ jobs:
176176
msbuildArgs:/p:PreferredToolArchitecture=x64 /p:SpectreMitigation=Spectre
177177
platform:ARM64
178178
configuration:Release
179-
180-
-job:UWP_BUILD
181-
displayName:'Universal Windows Platform (UWP)'
182-
timeoutInMinutes:60
183-
cancelTimeoutInMinutes:1
184-
steps:
185-
-checkout:self
186-
clean:true
187-
fetchTags:false
188-
-task:VSBuild@1
189-
displayName:Build solution UVAtlas_Windows10_2022.sln 32dbg
190-
inputs:
191-
solution:UVAtlas_Windows10_2022.sln
192-
msbuildArgs:/p:PreferredToolArchitecture=x64
193-
platform:x86
194-
configuration:Debug
195-
-task:VSBuild@1
196-
displayName:Build solution UVAtlas_Windows10_2022.sln 32rel
197-
inputs:
198-
solution:UVAtlas_Windows10_2022.sln
199-
msbuildArgs:/p:PreferredToolArchitecture=x64
200-
platform:x86
201-
configuration:Release
202-
-task:VSBuild@1
203-
displayName:Build solution UVAtlas_Windows10_2022.sln 64dbg
204-
inputs:
205-
solution:UVAtlas_Windows10_2022.sln
206-
msbuildArgs:/p:PreferredToolArchitecture=x64
207-
platform:x64
208-
configuration:Debug
209-
-task:VSBuild@1
210-
displayName:Build solution UVAtlas_Windows10_2022.sln 64rel
211-
inputs:
212-
solution:UVAtlas_Windows10_2022.sln
213-
msbuildArgs:/p:PreferredToolArchitecture=x64
214-
platform:x64
215-
configuration:Release
216-
-task:VSBuild@1
217-
displayName:Build solution UVAtlas_Windows10_2022.sln arm64dbg
218-
inputs:
219-
solution:UVAtlas_Windows10_2022.sln
220-
msbuildArgs:/p:PreferredToolArchitecture=x64
221-
platform:ARM64
222-
configuration:Debug
223-
-task:VSBuild@1
224-
displayName:Build solution UVAtlas_Windows10_2022.sln arm64rel
225-
inputs:
226-
solution:UVAtlas_Windows10_2022.sln
227-
msbuildArgs:/p:PreferredToolArchitecture=x64
228-
platform:ARM64
229-
configuration:Release

‎build/UVAtlas-SDL.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ variables:
2727
Codeql.Enabled:true
2828
Codeql.Language:cpp
2929
Codeql.ExcludePathPatterns:vcpkg
30+
VC_PATH:'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
3031
VS_GENERATOR:'Visual Studio 17 2022'
3132
VCPKG_CMAKE_DIR:'$(VCPKG_ROOT)/scripts/buildsystems/vcpkg.cmake'
3233
GITHUB_PAT:$(GITHUBPUBLICTOKEN)
@@ -166,3 +167,37 @@ jobs:
166167
GdnBreakPolicyMinSev:'Error'
167168
-task:ComponentGovernanceComponentDetection@0
168169
displayName:Component Detection
170+
171+
-job:VC_PREFAST
172+
displayName:'Build using /analyze (PREFAST)'
173+
workspace:
174+
clean:all
175+
steps:
176+
-checkout:self
177+
clean:true
178+
fetchTags:false
179+
-task:CmdLine@2
180+
displayName:Setup environment for CMake to use VS
181+
inputs:
182+
script:|
183+
call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
184+
echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
185+
echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
186+
echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
187+
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
188+
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
189+
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
190+
echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
191+
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
192+
echo ##vso[task.setvariable variable=LIB;]%LIB%
193+
194+
-task:CMake@1
195+
displayName:CMake Config
196+
inputs:
197+
cwd:'$(Build.SourcesDirectory)'
198+
cmakeArgs:--preset=x64-Debug -DENABLE_CODE_ANALYSIS=ON
199+
-task:CMake@1
200+
displayName:CMake Build
201+
inputs:
202+
cwd:'$(Build.SourcesDirectory)'
203+
cmakeArgs:--build out/build/x64-Debug

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp