Skip to content

Commit f9b9e18

Browse files
committed
master is broken anyway? So let's break it more.
1 parent 40fc484 commit f9b9e18

File tree

2 files changed

+28
-50
lines changed

2 files changed

+28
-50
lines changed

CI/AZ_MainPipeline.yml

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ resources:
1717
type: github
1818
name: tSQLt/tmp6
1919
endpoint: GitHub-tSQLt-Robot
20+
ref: (https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops) -- {{ $ArtifactBranchName }}
2021

2122

2223
stages:
@@ -32,47 +33,9 @@ stages:
3233
persistCredentials: true
3334
path: tSQLtArtifacts
3435

35-
- task: PowerShell@2
36-
name: the_test
37-
env:
38-
GITHUB_USERNAME: $(GitHubUserName)
39-
GITHUB_EMAIL: $(GitHubEmail)
40-
inputs:
41-
targetType: 'inline'
42-
failOnStderr: false
43-
## git seems to print progress to stderror
44-
script: |
45-
$CheckIfGitOk = {param($isOk);if(-not $isOk){Write-Host "##vso[task.logissue type=error]GIT Failed!";throw "GIT Failed!"}};
46-
47-
Get-Location;
48-
Set-Location "$(Pipeline.Workspace)\tSQLtArtifacts\";
49-
Write-Host ("ArtifactBranchName: {0}" -f "$(ArtifactBranchName)");
50-
try{
51-
git config --global user.email "$env:GITHUB_EMAIL"
52-
git config --global user.name "$env:GITHUB_USERNAME"
53-
git status
54-
git remote show origin
55-
56-
$B = (git branch -r --list "origin/$(ArtifactBranchName)")
57-
$CheckIfGitOk.invoke($?);
58-
if( -not [string]::IsNullOrEmpty($B) )
59-
{
60-
Write-Host "##vso[task.setvariable variable=BuiltAlready;isOutput=true]true";
61-
Write-Host "Build Branch Found";
62-
}
63-
else
64-
{
65-
Write-Host "##vso[task.setvariable variable=BuiltAlready;isOutput=true]false";
66-
Write-Host "Build Branch NOT Found";
67-
};
68-
}catch{
69-
throw "Git Failed. See prior errors.";
70-
}
71-
git status
72-
7336
- job: CompileCLR
7437
dependsOn: Check_If_Built_Already
75-
condition: and(succeeded(),eq(dependencies.Check_If_Built_Already.outputs['the_test.BuiltAlready'], 'false'))
38+
condition: failed()
7639
timeoutInMinutes: 10
7740
cancelTimeoutInMinutes: 2
7841

@@ -292,19 +255,19 @@ stages:
292255
293256
Set-Location "$(Pipeline.Workspace)\tSQLtArtifacts\";
294257
295-
Write-Host ("ArtifactBranchName: {0}" -f "$(ArtifactBranchName)");
296-
try{
297-
git status
298-
git remote show origin
258+
# Write-Host ("ArtifactBranchName: {0}" -f "$(ArtifactBranchName)");
259+
# try{
260+
# git status
261+
# git remote show origin
299262
300-
git fetch
301-
git checkout "$(ArtifactBranchName)"
302-
$CheckIfGitOk.invoke($?);
263+
# git fetch
264+
# git checkout "$(ArtifactBranchName)"
265+
# $CheckIfGitOk.invoke($?);
303266
304-
git status
305-
}catch{
306-
throw "Git Failed. See prior errors.";
307-
}
267+
# git status
268+
# }catch{
269+
# throw "Git Failed. See prior errors.";
270+
# }
308271
309272
New-Item -Path $ArtifactTargetPath -ItemType directory -Force
310273

tSQLtCLR/OfficialSigningKey/InstallSigningKey.bat

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,39 @@ cd /d "%~dp0"
88
DEL KeyInfo.txt
99
DEL KeyInfoC.txt
1010
ECHO --------------------------------------------------------------------------------------------------------------------
11+
ECHO Are key containers computer-specific, or user-specific
12+
ECHO --------------------------------------------------------------------------------------------------------------------
13+
ECHO.
14+
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -m
15+
ECHO.
16+
ECHO --------------------------------------------------------------------------------------------------------------------
1117
ECHO Deleting existing container (might fail)
1218
ECHO --------------------------------------------------------------------------------------------------------------------
19+
ECHO.
1320
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -d tSQLt_OfficialSigningKey
21+
ECHO.
1422
ECHO --------------------------------------------------------------------------------------------------------------------
1523
ECHO Installing Key
1624
ECHO --------------------------------------------------------------------------------------------------------------------
25+
ECHO.
1726
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -i tSQLtOfficialSigningKey.pfx tSQLt_OfficialSigningKey
27+
ECHO.
1828
ECHO --------------------------------------------------------------------------------------------------------------------
1929
ECHO Extracting Key Info
2030
ECHO --------------------------------------------------------------------------------------------------------------------
31+
ECHO.
2132
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -p tSQLtOfficialSigningKey.pfx KeyInfo.txt sha1
2233
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -pc tSQLt_OfficialSigningKey KeyInfoC.txt sha1
34+
ECHO.
2335
ECHO --------------------------------------------------------------------------------------------------------------------
2436
ECHO KeyInfo from file
2537
ECHO --------------------------------------------------------------------------------------------------------------------
38+
ECHO.
2639
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -tp KeyInfo.txt
40+
ECHO.
2741
ECHO --------------------------------------------------------------------------------------------------------------------
2842
ECHO KeyInfo from container
2943
ECHO --------------------------------------------------------------------------------------------------------------------
44+
ECHO.
3045
"c:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\sn.exe" -tp KeyInfoC.txt
3146

0 commit comments

Comments
 (0)