Remove the duplicate checkout step, which both removes warnings and a weird subfolder.

Also fixes sourcelink to always point to the GitHub repo for user mode builds. Previously, user mode builds just would have had no source link. But because we eventually will push any changes to GitHub (We will never have internal only fixes) we want to always point to GitHub

Co-authored-by: Nick Banks <nibanks@microsoft.com>
This commit is contained in:
Thad House 2021-10-21 13:30:51 -07:00 коммит произвёл GitHub
Родитель 12eb0da8b6
Коммит 87a7142384
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 13 добавлений и 15 удалений

Просмотреть файл

@ -6,14 +6,10 @@ jobs:
value: false
- name: skipComponentGovernanceDetection
value: true
workspace:
clean: all
pool:
vmImage: ubuntu-latest
steps:
- checkout: self
- template: ./download-artifacts.yml
parameters:
platform: linux

Просмотреть файл

@ -9,23 +9,22 @@ jobs:
pool:
type: linux
variables:
ob_outputDirectory: $(Build.SourcesDirectory)\msquic\artifacts\bin\${{ parameters.platform }}
ob_outputDirectory: $(Build.SourcesDirectory)/artifacts/bin/${{ parameters.platform }}
ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
ob_sdl_codeSignValidation_excludes: -|**\*.exe # Disable signing requirements for test executables
steps:
- checkout: self
target: linux_build_container
- task: PowerShell@2
displayName: Prepare Build Machine
target: linux_build_container
inputs:
pwsh: true
filePath: msquic/scripts/prepare-machine.ps1
filePath: scripts/prepare-machine.ps1
arguments: -Configuration OneBranch -InitSubmodules -Tls ${{ parameters.tls }} -FailOnError -Extra '${{ parameters.extraBuildArgs }}'
- task: PowerShell@2
displayName: x64
target: linux_build_container
inputs:
pwsh: true
filePath: msquic/scripts/build.ps1
filePath: scripts/build.ps1
arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} -Arch x64 -CI -UseSystemOpenSSLCrypto

Просмотреть файл

@ -8,8 +8,6 @@ jobs:
variables:
ob_outputDirectory: $(Build.SourcesDirectory)\artifacts\dist
steps:
- checkout: self
- task: NuGetToolInstaller@1
- task: DownloadPipelineArtifact@2

Просмотреть файл

@ -12,8 +12,6 @@ jobs:
ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
ob_sdl_codeSignValidation_excludes: -|**\*.sys # Disable signing requirements for KM builds
steps:
- checkout: self
target: windows_build_container2
- script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} x64
displayName: x64
target: windows_build_container2

Просмотреть файл

@ -13,8 +13,6 @@ jobs:
ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
ob_sdl_codeSignValidation_excludes: -|**\*.exe # Disable signing requirements for test executables
steps:
- checkout: self
target: windows_build_container2
- task: PowerShell@2
displayName: x64
target: windows_build_container2

Просмотреть файл

@ -10,7 +10,6 @@ jobs:
value: false
- group: VPackDeploymentKeys
steps:
- template: ./download-artifacts.yml
parameters:
platform: winkernel

Просмотреть файл

@ -89,6 +89,16 @@ function(build_source_link_rule LOCAL_PATH GIT_REMOTE GIT_CURRENT_HASH OUTPUT)
# Escape any backslashes for JSON
string(REPLACE "\\" "\\\\" LOCAL_PATH ${LOCAL_PATH})
# If this is an mscodehub URL, replace with the equivalent GitHub URL.
if (("${GIT_REMOTE}" MATCHES "https://mscodehub\\.visualstudio\\.com/msquic/_git/msquic"))
set(GIT_REMOTE "https://github.com/microsoft/msquic")
endif()
# If this is an mscodehub dev URL, replace with the equivalent GitHub URL.
if (("${GIT_REMOTE}" MATCHES "https://dev\\.azure\\.com/mscodehub/_git/msquic"))
set(GIT_REMOTE "https://github.com/microsoft/msquic")
endif()
# Verify this is a GitHub URL
# In the future we could support other source servers but currently they
# are not supported