diff options
| author | Adonais Romero González <[email protected]> | 2023-06-01 16:01:04 -0700 |
|---|---|---|
| committer | Adonais Romero González <[email protected]> | 2023-06-01 16:01:04 -0700 |
| commit | d7e054c83e0f56af4fed7dfedeb99123d2c36938 (patch) | |
| tree | c6e5d22bcc5a9a839f23dbd5c5dfec6a2bf4d701 | |
| parent | d2c881061d1545ff449ca64b72c2c4bdc37d622b (diff) | |
| parent | c5cc3eca707a39d71a3f34281af107795b2af945 (diff) | |
Merge branch 'main' into develop
| -rw-r--r-- | .github/workflows/Code-Scanning.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/ci-pr.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 10 | ||||
| -rw-r--r-- | Build-SampleSet.ps1 | 2 | ||||
| -rw-r--r-- | Building-Locally.md | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/.github/workflows/Code-Scanning.yml b/.github/workflows/Code-Scanning.yml index c3094b4b..fc1ae7e8 100644 --- a/.github/workflows/Code-Scanning.yml +++ b/.github/workflows/Code-Scanning.yml @@ -43,10 +43,9 @@ jobs: languages: ${{ matrix.language }} - name: Add MSBuild to PATH - uses: microsoft/[email protected] + uses: microsoft/[email protected] - name: Retrieve and build all available solutions - id: build-all-samples run: | .\Build-AllSamples.ps1 -Verbose -ThrottleLimit 1 env: diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 147bd4e2..ad170154 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -22,7 +22,7 @@ jobs: submodules: 'recursive' - name: Add MSBuild to PATH - uses: microsoft/[email protected] + uses: microsoft/[email protected] - name: Get changed files id: get-changed-files @@ -31,10 +31,16 @@ jobs: separator: "," - name: Retrieve and build solutions from changed files - id: build-changed-samples run: | $changedFiles = "${{ steps.get-changed-files.outputs.all_changed_files }}".Split(',') .\.github\scripts\Build-ChangedSamples.ps1 -ChangedFiles $changedFiles -Verbose env: WDS_Configuration: ${{ matrix.configuration }} WDS_Platform: ${{ matrix.platform }} + + - name: Archive logs + uses: actions/upload-artifact@v3 + if: always() + with: + name: logs + path: _logs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b97cfff..70610fc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,18 @@ jobs: submodules: 'recursive' - name: Add MSBuild to PATH - uses: microsoft/[email protected] + uses: microsoft/[email protected] - name: Retrieve and build all available solutions - id: build-all-samples run: | .\Build-AllSamples.ps1 -Verbose env: WDS_Configuration: ${{ matrix.configuration }} WDS_Platform: ${{ matrix.platform }} + + - name: Archive logs + uses: actions/upload-artifact@v3 + if: always() + with: + name: logs + path: _logs diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1 index 32821980..cb7c2a5f 100644 --- a/Build-SampleSet.ps1 +++ b/Build-SampleSet.ps1 @@ -20,7 +20,7 @@ if ($PSBoundParameters.ContainsKey('Verbose')) { } New-Item -ItemType Directory -Force -Path $LogFilesDirectory | Out-Null -$sampleBuilderFilePath = "$LogFilesDirectory\overview.htm" +$sampleBuilderFilePath = "$LogFilesDirectory\_overview.htm" Remove-Item -Recurse -Path $LogFilesDirectory 2>&1 | Out-Null diff --git a/Building-Locally.md b/Building-Locally.md index 8f62a609..b4f0339a 100644 --- a/Building-Locally.md +++ b/Building-Locally.md @@ -72,5 +72,5 @@ Excluded: 56 Unsupported: 230 Failed: 0 Log files directory: .\_logs -Overview report: .\_logs\overview.htm +Overview report: .\_logs\_overview.htm ``` |