Skip to content

Unblock ADO mirror: BYPASS_SECRET_SCANNING (empty commit, ff-merge only)#881

Merged
ahmedmuhsin merged 1 commit into
devfrom
bypass-secret-scanning
Jul 24, 2026
Merged

Unblock ADO mirror: BYPASS_SECRET_SCANNING (empty commit, ff-merge only)#881
ahmedmuhsin merged 1 commit into
devfrom
bypass-secret-scanning

Conversation

@ahmedmuhsin

Copy link
Copy Markdown
Contributor

Purpose

Adds a single empty commit (**BYPASS_SECRET_SCANNING**) so the GitHub → Azure DevOps mirror can complete. This follows the 1ES Secret Scanning soft-blocking guidance and does not rewrite history, move tags, or change any existing commit SHAs.

Background

The mirror to azfunc/internal/_git/azure.azure-functions-java-worker is failing with 1ES VS403654: NonbypassableBlock. Commit 079a4d4 (May 2026) carries private-key test fixtures under src/test/resources/grpc-tls/ (localhost-key.pem, localhost-truststore.p12). Those fixtures were already removed from the tip and are now generated at runtime (#878); this empty commit clears the historical mirror block without touching history.

⚠️ How to merge — FAST-FORWARD ONLY

The **BYPASS_SECRET_SCANNING** commit must become the unmodified HEAD of dev at mirror time. Do NOT use the GitHub Merge / Squash / Rebase buttons — they rewrite or bury the commit and the bypass will not take effect.

After approval, merge locally with fast-forward only:

git fetch origin
git checkout dev
git pull origin dev
git merge --ff-only origin/bypass-secret-scanning
git push origin dev

This guarantees no merge commit is created, the BYPASS commit stays intact, and it becomes the HEAD of dev.

@ahmedmuhsin
ahmedmuhsin merged commit fb21bd3 into dev Jul 24, 2026
23 checks passed
@ahmedmuhsin
ahmedmuhsin deleted the bypass-secret-scanning branch July 24, 2026 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants