-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/162-Fix-Remove-IshPublicationOutpu…
…t-with-Force
- Loading branch information
Showing
98 changed files
with
20,905 additions
and
842 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,13 +16,13 @@ jobs: | |
runs-on: windows-latest | ||
|
||
steps: | ||
- name: PowerShell Update - 7.2.13/lts has issues, updating to latest stable (like 7.3.6 or higher) | ||
uses: bjompen/[email protected] | ||
with: | ||
ReleaseVersion: 'Stable' | ||
|
||
- uses: actions/checkout@v3 | ||
|
||
# - name: Setup .NET 3.1.x | ||
# uses: actions/setup-dotnet@v1 | ||
# with: | ||
# dotnet-version: 3.1.x | ||
|
||
- name: Setup .NET 6.0.x | ||
uses: actions/setup-dotnet@v3 | ||
with: | ||
|
@@ -66,6 +66,8 @@ jobs: | |
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: | | ||
$filePath = 'Source/ISHRemote/Trisoft.ISHRemote/ISHRemote.PesterSetup.Debug.ps1' | ||
Add-Content -Path $filePath -Value '# File[$filePath] is generated through continuous-integration.yml section PowerShell 7.x' | ||
|
@@ -87,6 +89,8 @@ jobs: | |
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: Invoke-Pester -Path Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/_TestEnvironment/TestPrerequisite.Tests.ps1 -Output Detailed -Passthru | Export-CliXml -Path Cmdlets.Pester.Tests.xml | ||
- name: Upload test results | ||
uses: actions/upload-artifact@v3 | ||
|
@@ -100,6 +104,8 @@ jobs: | |
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: Invoke-Pester -Path Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/ -Output Detailed -Passthru | Export-CliXml -Path Cmdlets.Pester.Tests.xml | ||
- name: Upload test results | ||
uses: actions/upload-artifact@v3 | ||
|
@@ -114,12 +120,15 @@ jobs: | |
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: | | ||
$filePath = 'Source/ISHRemote/Trisoft.ISHRemote/ISHRemote.PesterSetup.Debug.ps1' | ||
Add-Content -Path $filePath -Value '# File[$filePath] is generated through continuous-integration.yml section Windows PowerShell 5.1' | ||
Add-Content -Path $filePath -Value '$baseUrl = $env:ISH_BASE_URL' | ||
Add-Content -Path $filePath -Value 'if ($baseUrl -like "*.sdlproducts.com*")' | ||
Add-Content -Path $filePath -Value '{' | ||
Add-Content -Path $filePath -Value ' $ishEventTypeToPurge = ''TESTBACKGROUNDTASK''' # before 14SP4 use ''PUSHTRANSLATIONS''' | ||
Add-Content -Path $filePath -Value ' $ishLngLabel = ''en-us''' | ||
Add-Content -Path $filePath -Value ' $ishLngTarget1 = ''VLANGUAGEESES''' | ||
Add-Content -Path $filePath -Value ' $ishLngTarget1Label = ''es-es''' | ||
|
@@ -128,12 +137,29 @@ jobs: | |
Add-Content -Path $filePath -Value ' $ishLngCombination = ''en-us''' | ||
Add-Content -Path $filePath -Value '}' | ||
- name: Pester Test Prerequisites using Windows PowerShell 5.1 | ||
shell: powershell | ||
env: | ||
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: Invoke-Pester -Path Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/_TestEnvironment/TestPrerequisite.Tests.ps1 -Output Detailed -Passthru | Export-CliXml -Path Cmdlets.Pester.Tests.xml | ||
- name: Upload test results | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: ISHRemote-MainCI-PesterPrerequisiteOnWindowsPowerShell | ||
path: Cmdlets.Pester.Tests.xml | ||
|
||
- name: Pester Test Cmdlets using Windows PowerShell 5.1 | ||
shell: powershell | ||
env: | ||
ISH_BASE_URL: ${{ secrets.ISH_BASE_URL }} | ||
ISH_USER_NAME: ${{ secrets.ISH_USER_NAME }} | ||
ISH_PASSWORD: ${{ secrets.ISH_PASSWORD }} | ||
ISH_CLIENT_ID: ${{ secrets.ISH_CLIENT_ID }} | ||
ISH_CLIENT_SECRET: ${{ secrets.ISH_CLIENT_SECRET }} | ||
run: Invoke-Pester -Path Source/ISHRemote/Trisoft.ISHRemote/Cmdlets/ -Output Detailed -Passthru | Export-CliXml -Path Cmdlets.Pester.Tests.xml | ||
- name: Upload test results | ||
uses: actions/upload-artifact@v3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+946 KB
...ages/ISHRemote-8.0--BrowserAuthorizationCodeFlowUsingISHIDOnTridionDocs15.0.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.