Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Windows] Adding Swig #3509

Merged
merged 17 commits into from
Jun 7, 2021
Merged

[Windows] Adding Swig #3509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
01f532c
Update windows2019.json
kassannk Jun 2, 2021
6bc366e
Update windows2016.json
kassannk Jun 2, 2021
d6658ad
Create Install-Swig.ps1
kassannk Jun 2, 2021
233ccbe
Add SwigVersion
kassannk Jun 2, 2021
cdd43a5
Add Get-SwigVersion function
kassannk Jun 2, 2021
0bac688
Add swig test
kassannk Jun 2, 2021
1aeb2e6
Add Swig test
kassannk Jun 2, 2021
0d83b75
fix swig output version
kassannk Jun 2, 2021
5e10160
add extra line
kassannk Jun 2, 2021
16181b6
fix
kassannk Jun 2, 2021
f8a1a33
Fixed. swig only version displayed
kassannk Jun 3, 2021
7089082
Fix SwigVersion
kassannk Jun 3, 2021
8a90068
Little fixed
kassannk Jun 3, 2021
c969f10
Update SoftwareReport.Tools.psm1
kassannk Jun 3, 2021
319041f
Merge branch 'actions:main' into win_add_swig
kassannk Jun 4, 2021
46ef229
replaced with more readable code. swig
kassannk Jun 4, 2021
3d81329
little fix Out-Null
kassannk Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions images/win/scripts/Installers/Install-Swig.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
################################################################################
## File: Install-Swig.ps1
## Desc: Install Swig
################################################################################

Choco-Install -PackageName swig

Invoke-PesterTests -TestFile "Tools" -TestName "Swig"
1 change: 1 addition & 0 deletions images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ $markdown += New-MDList -Style Unordered -Lines (@(
(Get-StackVersion),
(Get-SVNVersion),
(Get-VSWhereVersion),
(Get-SwigVersion),
(Get-WinAppDriver),
(Get-ZstdVersion),
(Get-YAMLLintVersion)
Expand Down
8 changes: 7 additions & 1 deletion images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,10 @@ function Get-DacFxVersion {
cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\"
$dacfxversion = (./sqlpackage.exe /version)
return "DacFx $dacfxversion"
}
}

function Get-SwigVersion {
(swig -version | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$swigVersion = $Matches.Version
return "Swig $swigVersion"
}
6 changes: 6 additions & 0 deletions images/win/scripts/Tests/Tools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,9 @@ Describe "Pipx" {
"pipx --version" | Should -ReturnZeroExitCode
}
}

Describe "Swig" {
It "Swig" {
"swig -version" | Should -ReturnZeroExitCode
}
maxim-lobanov marked this conversation as resolved.
Show resolved Hide resolved
}
3 changes: 2 additions & 1 deletion images/win/windows2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@
"{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
"{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1",
"{{ template_dir }}/scripts/Installers/Install-Apache.ps1",
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1"
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1",
"{{ template_dir }}/scripts/Installers/Install-Swig.ps1"
]
},
{
Expand Down
3 changes: 2 additions & 1 deletion images/win/windows2019.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@
"{{ template_dir }}/scripts/Installers/Install-Selenium.ps1",
"{{ template_dir }}/scripts/Installers/Install-IEWebDriver.ps1",
"{{ template_dir }}/scripts/Installers/Install-Apache.ps1",
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1"
"{{ template_dir }}/scripts/Installers/Install-Nginx.ps1",
"{{ template_dir }}/scripts/Installers/Install-Swig.ps1"
]
},
{
Expand Down