Skip to content

Commit e4aafff

Browse files
authored
Merge branch 'main' into update-dev-container
2 parents e5419e6 + 178372b commit e4aafff

File tree

102 files changed

+1213
-131
lines changed

Some content is hidden

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

102 files changed

+1213
-131
lines changed

.github/ISSUE_TEMPLATE/04_bug.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ labels: bug
66
assignees:
77
---
88

9+
🚨 Please Read Before Posting 🚨
10+
11+
You are currently in a PUBLIC REPOSITORY.
12+
13+
No Internal Information: Do not share links to internal Zendesk tickets, repositories, team names, or any internal
14+
details.
15+
16+
Confidentiality Matters: Remember that this repository is visible to the public. Avoid posting anything that should
17+
remain confidential or private.
18+
919
## Description
1020

1121
<!-- Include Screenshots or relevant code paths! -->

CONTRIBUTING.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,34 @@ Use the [Discussions](https://github.com/github/gh-gei/discussions) tab in this
2020

2121
All work done by the maintainers of this repo is tracked in this repo using Issues. We have a hierarchical backlog with Epics at the top, broken down into Batches then broken down to Tasks (epic/batch/task is indicated via labels on the issues). You can see an example Epic and navigate down from there [here](https://github.com/github/gh-gei/issues/101).
2222

23+
## Running tests
24+
25+
### In the terminal
26+
If you want to run tests selectively in the terminal, you can use dotnet test with `--filter` option.
27+
28+
Here are some examples:
29+
1. Run all tests in `AdoApiTests` class. Navigate to either `src` (where the `sln` file is) or `src/octoshiftcli.tests` (where the `csproj` file is) and then execute the following command:
30+
```
31+
dotnet test --filter AdoApiTests
32+
```
33+
34+
2. Run a specific test-`GetUserId_Should_Return_UserId` in `src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests`. Navigate to `src` or `src/octoshiftcli.tests` and then execute the following command:
35+
```
36+
dotnet test --filter AdoApiTests.GetUserId_Should_Return_UserId
37+
```
38+
39+
### Debugger
40+
41+
If you are using VS code, you can install the [C# dev kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit) which will add the testing extension.
42+
- Press the play to run the entire test suite, or navigate to the specific test you would like to run.
43+
- If you set a breakpoint within your code and press the play button with the bug next to it you will be able to inspect your code in more detial.
44+
45+
### Useful links
46+
1. [Dotnet test commands](https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details)
47+
2. [Run selective unit tests](https://learn.microsoft.com/en-us/dotnet/core/testing/selective-unit-tests?pivots=mstest)
48+
3. [C# dev kit](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit)
49+
50+
2351

2452
## Debugging code
2553

LATEST-VERSION.txt

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

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@ Refer to the [official documentation](https://docs.github.com/en/migrations/usin
8787

8888
Refer to the [official documentation](https://docs.github.com/en/migrations/using-github-enterprise-importer/migrating-repositories-with-github-enterprise-importer/migrating-repositories-from-bitbucket-server-to-github-enterprise-cloud) for more details.
8989

90+
### Skipping version checks
91+
92+
When the CLI is launched, it logs if a newer version of the CLI is available. You can skip this check by setting the `GEI_SKIP_VERSION_CHECK` environment variable to `true`.
93+
9094
### Skipping GitHub status checks
9195

9296
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`.

docs/ContributingCode.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,18 @@ There are 3 types of static analysis that are enforced on every PR:
6868
## Publishing a Release
6969
Only repo maintainers can publish a release. The process is kicked off by pushing a tag in the format `v0.7`. We follow [Semantic Versioning](https://semver.org/) when deciding on the next version number.
7070
71-
This will trigger an Actions workflow that results in a new release being published. It performs these steps:
72-
- Validates that the SHA referenced by the tag is in the history of the `main` branch
73-
- Runs `publish.ps1` to build self-contained binaries for each platform. This script also embeds the version number (extracted from the tag) into each binary.
74-
- Creates a release in this repo with the self-contained binaries, uses the contents of `RELEASENOTES.md` as the release description.
75-
- Moves the contents of `RELEASENOTES.md` to a version specific file under the releasenotes folder, then empties out `RELEASENOTES.md` and commits the 2 files
71+
### How to publish a release
72+
73+
1. Check [`RELEASENOTES.md`](http://releasenotes.md/) to see if there is anything to release.
74+
2. Switch to the `main` branch and `pull` the latest.
75+
3. *optional* List the tags e.g. `git tag`
76+
4. Tag the version e.g. `git tag v5.0`
77+
5. Push the tags up e.g. `git push --tags`
78+
6. This will trigger an Actions workflow that results in a new release being published, once the build is done it will wait for approval(from maintainers) in order to `pushlish` the binaries. The workflow does the following steps:
79+
- Validates that the SHA referenced by the tag is in the history of the `main` branch
80+
- Runs `publish.ps1` to build self-contained binaries for each platform. This script also embeds the version number (extracted from the tag) into each binary.
81+
- Creates a release in this repo with the self-contained binaries, uses the contents of `RELEASENOTES.md` as the release description.
82+
- Moves the contents of `[RELEASENOTES.md](http://RELEASENOTES.md)` to a version specific file under the name of the created `tag` in the releasenotes folder, then empties out `RELEASENOTES.md` and commits the 2 files.
7683
7784
## Development Basics
7885

releasenotes/v1.5.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Redact `X-Amz-Credential` querystring parameters in AWS S3 URLs included in logs
2+
- When redacting sensitive patterns in log output, use a non-case sensitive search

releasenotes/v1.6.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
- Skip latest version check on startup if environment variable `GEI_SKIP_VERSION_CHECK` is set to `true`

releasenotes/v1.7.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add new `gh [gei|bbs2gh|ado2gh] abort-migration` command to cancel a migration that is in the queue or in progress
2+
- Fix suggested command for downloading logs in `gh gei migrate-repo` log output

releasenotes/v1.7.1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Update `bbs2gh inventory-report` help text to document that personal repositories owned by users are not supported
2+
- Update `ado2gh lock-repo` help text to document the scopes required for your Azure DevOps personal access token

releasenotes/v1.8.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Add `--target-api-url` to commonly used commands to support newer GitHub migration paths.
2+
- Fixed `gh ado2gh rewire-pipeline` command for ADO Team Projects with more than 10,000 Build Definitions.

0 commit comments

Comments
 (0)