Skip to content

Commit 0eb46a3

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge branch 'master' into collections-abc
2 parents 9bc44f2 + 3faf826 commit 0eb46a3

File tree

1,136 files changed

+46877
-25429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,136 files changed

+46877
-25429
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
testRunPlatform: macos
4343

4444
pool:
45-
vmImage: xcode9-macos10.13
45+
vmImage: macos-10.14
4646

4747
steps:
4848
- template: ./macos-steps.yml
@@ -59,7 +59,7 @@ jobs:
5959
variables:
6060
testRunTitle: '$(build.sourceBranchName)-linux'
6161
testRunPlatform: linux
62-
openssl_version: 1.1.1c
62+
openssl_version: 1.1.1d
6363

6464
steps:
6565
- template: ./posix-steps.yml
@@ -116,7 +116,7 @@ jobs:
116116
variables:
117117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118118
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1c
119+
openssl_version: 1.1.1d
120120

121121
steps:
122122
- template: ./posix-steps.yml
@@ -131,7 +131,7 @@ jobs:
131131
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
132132

133133
pool:
134-
vmImage: vs2017-win2016
134+
vmImage: windows-2019
135135

136136
strategy:
137137
matrix:

‎.azure-pipelines/macos-steps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ steps:
1414

1515
- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
1616
displayName: 'Tests'
17+
continueOnError: true
18+
timeoutInMinutes: 30
1719

1820
- task: PublishTestResults@2
1921
displayName: 'Publish Test Results'

‎.azure-pipelines/posix-deps-apt.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
apt-get update
23

34
apt-get -yq install \

‎.azure-pipelines/pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
testRunPlatform: macos
4141

4242
pool:
43-
vmImage: xcode9-macos10.13
43+
vmImage: macos-10.14
4444

4545
steps:
4646
- template: ./macos-steps.yml
@@ -59,7 +59,7 @@ jobs:
5959
variables:
6060
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6161
testRunPlatform: linux
62-
openssl_version: 1.1.1c
62+
openssl_version: 1.1.1d
6363

6464
steps:
6565
- template: ./posix-steps.yml
@@ -116,7 +116,7 @@ jobs:
116116
variables:
117117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118118
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1c
119+
openssl_version: 1.1.1d
120120

121121
steps:
122122
- template: ./posix-steps.yml
@@ -131,7 +131,7 @@ jobs:
131131
condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
132132

133133
pool:
134-
vmImage: vs2017-win2016
134+
vmImage: windows-2019
135135

136136
strategy:
137137
matrix:

‎.azure-pipelines/windows-release/msi-steps.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ steps:
5151
artifactName: tcltk_lib_amd64
5252
targetPath: $(Build.BinariesDirectory)\tcltk_lib_amd64
5353

54+
- powershell: |
55+
copy $(Build.BinariesDirectory)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
56+
displayName: 'Copy signed files into sources'
57+
5458
- script: |
5559
call Tools\msi\get_externals.bat
5660
call PCbuild\find_python.bat

‎.azure-pipelines/windows-release/stage-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
displayName: Publish Tcl/Tk Library
123123

124124
pool:
125-
vmName: win2016-vs2017
125+
vmName: windows-latest
126126

127127
workspace:
128128
clean: all

‎.azure-pipelines/windows-release/stage-layout-full.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
artifactName: tcltk_lib_$(Name)
4848
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4949

50+
- powershell: |
51+
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
52+
displayName: 'Copy signed files into sources'
53+
5054
- template: ./layout-command.yml
5155

5256
- powershell: |

‎.azure-pipelines/windows-release/stage-layout-msix.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ jobs:
4040
artifactName: tcltk_lib_$(Name)
4141
targetPath: $(Build.BinariesDirectory)\tcltk_lib
4242

43+
- powershell: |
44+
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
45+
displayName: 'Copy signed files into sources'
46+
4347
- template: ./layout-command.yml
4448

4549
- powershell: |

‎.azure-pipelines/windows-release/stage-layout-nuget.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ jobs:
2929
artifactName: bin_$(Name)
3030
targetPath: $(Build.BinariesDirectory)\bin
3131

32+
- powershell: |
33+
copy $(Build.BinariesDirectory)\bin\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
34+
displayName: 'Copy signed files into sources'
35+
3236
- template: ./layout-command.yml
3337

3438
- powershell: |

‎.azure-pipelines/windows-release/stage-sign.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
parameters:
2+
Include: '*.exe, *.dll, *.pyd, *.cat, *.ps1'
3+
Exclude: 'vcruntime*, libffi*, libcrypto*, libssl*'
4+
15
jobs:
26
- job: Sign_Python
37
displayName: Sign Python binaries
@@ -17,7 +21,7 @@ jobs:
1721
Name: amd64
1822

1923
steps:
20-
- checkout: none
24+
- template: ./checkout.yml
2125
- template: ./find-sdk.yml
2226

2327
- powershell: |
@@ -31,13 +35,18 @@ jobs:
3135
targetPath: $(Build.BinariesDirectory)\bin
3236

3337
- powershell: |
34-
$files = (gi *.exe, *.dll, *.pyd, *.cat -Exclude vcruntime*, libffi*, libcrypto*, libssl*)
38+
copy "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1" .
39+
displayName: 'Copy files from source'
40+
workingDirectory: $(Build.BinariesDirectory)\bin
41+
42+
- powershell: |
43+
$files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
3544
signtool sign /a /n "$(SigningCertificate)" /fd sha256 /d "$(SigningDescription)" $files
3645
displayName: 'Sign binaries'
3746
workingDirectory: $(Build.BinariesDirectory)\bin
3847
3948
- powershell: |
40-
$files = (gi *.exe, *.dll, *.pyd, *.cat -Exclude vcruntime*, libffi*, libcrypto*, libssl*)
49+
$files = (gi ${{ parameters.Include }} -Exclude ${{ parameters.Exclude }})
4150
$failed = $true
4251
foreach ($retry in 1..10) {
4352
signtool timestamp /t http://timestamp.verisign.com/scripts/timestamp.dll $files

0 commit comments

Comments
 (0)