Skip to content

Commit 9348cef

Browse files
authored
Merge branch 'main' into linux-arm64-build-isolated
2 parents b65ed95 + 0063cd9 commit 9348cef

37 files changed

+649
-85
lines changed

.github/workflows/CI.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ jobs:
2222
runs-on: ${{ matrix.runner-os }}
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
with:
2727
persist-credentials: false
2828
- uses: extractions/setup-just@v3
2929
- name: Initialize CodeQL
3030
if: matrix.runner-os == 'ubuntu-latest'
31-
uses: github/codeql-action/init@v3
31+
uses: github/codeql-action/init@v4
3232
with:
3333
languages: ${{ matrix.language }}
3434
queries: +security-and-quality
3535
config-file: ./.github/codeql/codeql-config.yml
3636

3737
- name: Setup .NET
38-
uses: actions/setup-dotnet@v4
38+
uses: actions/setup-dotnet@v5
3939
with:
4040
global-json-file: global.json
4141

@@ -52,12 +52,12 @@ jobs:
5252
run: just test-coverage
5353

5454
- name: Copy Coverage To Predictable Location
55-
if: always() && matrix.runner-os == 'ubuntu-latest'
55+
if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
5656
run: cp coverage/**/coverage.cobertura.xml coverage/coverage.cobertura.xml
5757

5858
- name: Code Coverage Summary Report
5959
uses: irongut/[email protected]
60-
if: always() && matrix.runner-os == 'ubuntu-latest'
60+
if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
6161
with:
6262
filename: coverage/coverage.cobertura.xml
6363
badge: true
@@ -66,22 +66,22 @@ jobs:
6666

6767
# This is used by the subsequent publish-test-results.yml
6868
- name: Upload Unit Test Results
69-
if: always() && matrix.runner-os == 'ubuntu-latest'
69+
if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
7070
uses: actions/upload-artifact@v4
7171
with:
7272
name: Unit Test Results
7373
path: src/OctoshiftCLI.Tests/unit-tests.xml
7474

7575
# This is used by the subsequent publish-test-results.yml
7676
- name: Upload Code Coverage Report
77-
if: always() && matrix.runner-os == 'ubuntu-latest'
77+
if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
7878
uses: actions/upload-artifact@v4
7979
with:
8080
name: Code Coverage Report
8181
path: code-coverage-results.md
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@v3
84+
uses: github/codeql-action/analyze@v4
8585
if: matrix.runner-os == 'ubuntu-latest'
8686

8787
upload-event-file:
@@ -102,13 +102,13 @@ jobs:
102102
target-os: [windows-latest, ubuntu-latest, macos-latest]
103103
runs-on: ubuntu-latest
104104
steps:
105-
- uses: actions/checkout@v4
105+
- uses: actions/checkout@v5
106106
with:
107107
persist-credentials: false
108108
- uses: extractions/setup-just@v3
109109

110110
- name: Setup .NET
111-
uses: actions/setup-dotnet@v4
111+
uses: actions/setup-dotnet@v5
112112
with:
113113
global-json-file: global.json
114114

@@ -150,17 +150,17 @@ jobs:
150150
runs-on: ${{ matrix.runner-os }}
151151
concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
152152
steps:
153-
- uses: actions/checkout@v4
153+
- uses: actions/checkout@v5
154154
with:
155155
persist-credentials: false
156156

157157
- name: Setup .NET
158-
uses: actions/setup-dotnet@v4
158+
uses: actions/setup-dotnet@v5
159159
with:
160160
global-json-file: global.json
161161

162162
- name: Download Binaries
163-
uses: actions/download-artifact@v4
163+
uses: actions/download-artifact@v6
164164
with:
165165
name: binaries-${{ matrix.runner-os }}
166166
path: dist
@@ -282,9 +282,8 @@ jobs:
282282
environment: PUBLISH_RELEASE
283283

284284
steps:
285-
- uses: actions/checkout@v4
285+
- uses: actions/checkout@v5
286286
with:
287-
persist-credentials: false
288287
token: ${{ secrets.RELEASE_NOTES_PAT }}
289288
fetch-depth: 0
290289

@@ -304,7 +303,7 @@ jobs:
304303
}
305304
306305
- name: Setup .NET
307-
uses: actions/setup-dotnet@v4
306+
uses: actions/setup-dotnet@v5
308307
with:
309308
global-json-file: global.json
310309

@@ -370,7 +369,7 @@ jobs:
370369
$TAG_NAME | Out-File ./LATEST-VERSION.txt
371370
372371
- name: Commit Release Notes and Version
373-
uses: stefanzweifel/git-auto-commit-action@v5
372+
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3
374373
with:
375374
commit_message: Automated commit of archived release notes and version file [skip ci]
376375
file_pattern: RELEASENOTES.md releasenotes/*.md LATEST-VERSION.txt

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- name: Setup .NET
2424
uses: actions/setup-dotnet@v2

.github/workflows/integration-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
target-os: [windows-latest, ubuntu-latest, macos-latest]
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v4
26+
- uses: actions/checkout@v5
2727
with:
2828
ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
2929
fetch-depth: 0
@@ -95,7 +95,7 @@ jobs:
9595
runs-on: ${{ matrix.runner-os }}
9696
concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
9797
steps:
98-
- uses: actions/checkout@v4
98+
- uses: actions/checkout@v5
9999
with:
100100
ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
101101
fetch-depth: 0
@@ -113,7 +113,7 @@ jobs:
113113
global-json-file: global.json
114114

115115
- name: Download Binaries
116-
uses: actions/download-artifact@v4
116+
uses: actions/download-artifact@v6
117117
with:
118118
name: binaries-${{ matrix.runner-os }}
119119
path: dist

.github/workflows/publish-test-results.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ jobs:
3535
3636
- name: Extract PR Number
3737
run: |
38-
eventjson=`cat 'artifacts/Event File/event.json'`
39-
prnumber=`echo $(jq -r '.pull_request.number' <<< "$eventjson")`
40-
echo "PR_NUMBER=$(echo $prnumber | tr -cd '0-9')" >> $GITHUB_ENV
41-
38+
prnumber=$(jq -r '.pull_request.number' < 'artifacts/Event File/event.json')
39+
sanitized_prnumber=$(grep -E '^[0-9]+$' <<< "$prnumber")
40+
echo "PR_NUMBER=$sanitized_prnumber" >> "$GITHUB_ENV"
4241
- name: Publish Unit Test Results
4342
uses: EnricoMi/publish-unit-test-result-action@v2
4443
with:

LATEST-VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.20.0
1+
v1.23.0

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,24 @@ When the CLI is launched, it logs if a newer version of the CLI is available. Yo
9595

9696
When the CLI is launched, it logs a warning if there are any ongoing [GitHub incidents](https://www.githubstatus.com/) that might affect your use of the CLI. You can skip this check by setting the `GEI_SKIP_STATUS_CHECK` environment variable to `true`.
9797

98+
### Configuring multipart upload chunk size
99+
100+
Set the `GITHUB_OWNED_STORAGE_MULTIPART_MEBIBYTES` environment variable to change the archive upload part size. Provide the value in mebibytes (MiB); For example:
101+
102+
```powershell
103+
# Windows PowerShell
104+
$env:GITHUB_OWNED_STORAGE_MULTIPART_MEBIBYTES = "10"
105+
```
106+
107+
```bash
108+
# macOS/Linux
109+
export GITHUB_OWNED_STORAGE_MULTIPART_MEBIBYTES=10
110+
```
111+
112+
This sets the chunk size to 10 MiB (10,485,760 bytes). The minimum supported value is 5 MiB, and the default remains 100 MiB.
113+
114+
This might be needed to improve upload reliability in environments with proxies or very slow connections.
115+
98116
## Contributions
99117

100118
See [Contributing](CONTRIBUTING.md) for more info on how to get involved.

RELEASENOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Added support for configurable multipart upload chunk size for GitHub-owned storage uploads via `GITHUB_OWNED_STORAGE_MULTIPART_MEBIBYTES` environment variable (minimum 5 MiB, default 100 MiB) to improve upload reliability in environments with proxies or slow connections

releasenotes/v1.21.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- **ado2gh**: Added support for GitHub Enterprise cloud with data residency app service connections when using `--rewire-pipelines`. The tool now recognizes both `GitHub` and `GitHubProximaPipelines` service connection types.

releasenotes/v1.22.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Added `--migration-id` option to `download-logs` command to allow downloading logs directly by migration ID without requiring org/repo lookup

releasenotes/v1.23.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- bbs2gh : Added validation for `--archive-path` and `--bbs-shared-home` options to fail fast with clear error messages if the provided paths do not exist or are not accessible. Archive path is now logged before upload operations to help with troubleshooting
2+
- ado2gh: Fixed `--rewire-pipelines` for GitHub Enterprise Cloud with data residency by correctly matching GitHubProximaPipelines service connections by team project name instead of GitHub organization name

0 commit comments

Comments
 (0)