Merge branch 'main' into issue-1365

Author: iomekam

.github/copilot-instructions.md

@@ -0,0 +1,27 @@
+This is a C# based repository that produces several CLIs that are used by customers to interact with the GitHub migration APIs. Please follow these guidelines when contributing:
+
+## Code Standards
+
+### Required Before Each Commit
+- Run `dotnet format src/OctoshiftCLI.sln` before committing any changes to ensure proper code formatting. This will run dotnet format on all C# files to maintain consistent style
+
+### Development Flow
+- Build: `dotnet build src/OctoshiftCLI.sln /p:TreatWarningsAsErrors=true`
+- Test: `dotnet test src/OctoshiftCLI.Tests/OctoshiftCLI.Tests.csproj`
+
+## Repository Structure
+- `src/`: Contains the main C# source code for the Octoshift CLI
+- `src/ado2gh/`: Contains the ADO to GH CLI commands
+- `src/bbs2gh/`: Contains the BBS to GH CLI commands
+- `src/gei/`: Contains the GitHub to GitHub CLI commands
+- `src/Octoshift/`: Contains shared logic used by multiple commands/CLIs
+- `src/OctoshiftCLI.IntegrationTests/`: Contains integration tests for the Octoshift CLI
+- `src/OctoshiftCLI.Tests/`: Contains unit tests for the Octoshift CLI
+
+## Key Guidelines
+1. Follow C# best practices and idiomatic patterns
+2. Maintain existing code structure and organization
+4. Write unit tests for new functionality.
+5. When making changes that would impact our users (e.g. new features or bug fixes), add a bullet point to `RELEASENOTES.md` with a user friendly brief description of the change
+6. Never silently swallow exceptions.
+7. If an exception is expected/understood and we can give a helpful user-friendly message, then throw an OctoshiftCliException with a user-friendly message. Otherwise let the exception bubble up and the top-level exception handler will log and handle it appropriately.

.github/workflows/integration-tests.yml

@@ -6,6 +6,14 @@ on:
       pr_number:
         type: number
         required: true
+      sha:
+        type: string
+        required: true
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
 
 jobs:
   build-for-e2e-test:
@@ -20,6 +28,19 @@ jobs:
         ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
         fetch-depth: 0
 
+    - name: Check SHA
+      run: |
+        git fetch origin refs/pull/${{ github.event.inputs.pr_number }}/head:pr-head
+        prsha=`git rev-parse pr-head | awk '{ print $1 }'`
+
+        echo "PR SHA: $prsha"
+        echo "expected SHA: ${{ github.event.inputs.SHA }}"
+
+        if [ "$prsha" != "${{ github.event.inputs.SHA }}" ]; then
+          echo "SHA must match" >&2
+          exit 1
+        fi
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
@@ -67,6 +88,7 @@ jobs:
   e2e-test:
     needs: [ build-for-e2e-test ]
     strategy:
+      fail-fast: false
       matrix:
         runner-os: [windows-latest, ubuntu-latest, macos-latest]
         source-vcs: [AdoBasic, AdoCsv, Bbs, Ghes, Github]