Skip to content

Remove skiasharp-docker service connection from native bootstrapper#4310

Merged
mattleibow merged 1 commit into
mainfrom
copilot/remove-skiasharp-docker-service-connection
Jul 2, 2026
Merged

Remove skiasharp-docker service connection from native bootstrapper#4310
mattleibow merged 1 commit into
mainfrom
copilot/remove-skiasharp-docker-service-connection

Conversation

Copilot AI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Description of Change

Drops the now-unused skiasharp-docker Docker service connection from the native build bootstrapper template.

  • Removed the authenticatedContainerRegistries block (serviceConnection: skiasharp-docker) from templateContext on the 1ES path.
  • Removed the Docker@2 login task (containerRegistry: skiasharp-docker) on the non-1ES path.

Docker image build/run steps are unchanged; only the private-registry authentication is dropped.

Bugs Fixed

None.

API Changes

None.

Behavioral Changes

None.

Required skia PR

None.

PR Checklist

  • Has tests (N/A — CI pipeline template change, not covered by unit tests)
  • Rebased on top of main at time of PR
  • Merged related skia PRs
  • Changes adhere to coding standard
  • Updated documentation

Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com>
@github-actions

github-actions Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

📦 Try the packages from this PR

Warning

Do not run these scripts without first reviewing the code in this PR.

Step 1 — Download the packages

bash / macOS / Linux:

curl -fsSL https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.sh | bash -s -- 4310

PowerShell / Windows:

iex "& { $(irm https://raw.githubusercontent.com/mono/SkiaSharp/main/scripts/get-skiasharp-pr.ps1) } 4310"

Step 2 — Add the local NuGet source

dotnet nuget add source ~/.skiasharp/hives/pr-4310/packages --name skiasharp-pr-4310
More options
Option Description
--successful-only / -SuccessfulOnly Only use successful builds
--force / -Force Overwrite previously downloaded packages
--list / -List List available artifacts without downloading
--build-id ID / -BuildId ID Download from a specific build

Or download manually from Azure Pipelines — look for the nuget artifact on the build for this PR.

Remove the source when you're done:

dotnet nuget remove source skiasharp-pr-4310

@mattleibow

Copy link
Copy Markdown
Contributor

/azp run

@mattleibow
mattleibow marked this pull request as ready for review July 2, 2026 10:24
@mattleibow
mattleibow requested a review from Copilot July 2, 2026 10:24
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines failed to run 1 pipeline(s).

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Removes the now-unused skiasharp-docker private-registry authentication steps from the native build bootstrapper Azure Pipelines template, leaving Docker image build/run behavior unchanged.

Changes:

  • Drops the 1ES templateContext.authenticatedContainerRegistries entry that referenced serviceConnection: skiasharp-docker.
  • Removes the non-1ES Docker@2 registry login step that used containerRegistry: skiasharp-docker.

@github-actions

github-actions Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

📖 Documentation Preview

The documentation for this PR has been deployed and is available at:

🔗 View Staging Site
🔗 View Staging Docs
🔗 View Staging Gallery (Blazor)
🔗 View Staging Gallery (Uno Platform)
🔗 View Staging SkiaFiddle

This preview will be updated automatically when you push new commits to this PR.


This comment is automatically updated by the documentation staging workflow.

@mattleibow

Copy link
Copy Markdown
Contributor

@copilot please give me a pr merge commit message using the skill

Copilot AI commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

@copilot please give me a pr merge commit message using the skill

[infra] Remove obsolete skiasharp-docker registry auth (#4310)

The native bootstrapper template still referenced the `skiasharp-docker`
service connection in both its 1ES and classic Docker paths even though these
jobs only build a local image from the checked-in Dockerfile and run it for the
bootstrapper step. Keeping the private-registry authentication in place leaves
the pipeline coupled to an external service connection that the template no
longer needs.

Remove the 1ES `authenticatedContainerRegistries` entry and the non-1ES
`Docker@2 login` task, but leave the Docker image build and `docker run` steps
unchanged. This preserves the native bootstrapper behavior while dropping the
stale service-connection dependency from the pipeline definition.

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: mattleibow <1096616+mattleibow@users.noreply.github.com>

Copilot AI requested a review from mattleibow July 2, 2026 13:50
@mattleibow
mattleibow merged commit 72ce599 into main Jul 2, 2026
7 of 8 checks passed
@mattleibow
mattleibow deleted the copilot/remove-skiasharp-docker-service-connection branch July 2, 2026 14:02
mattleibow pushed a commit that referenced this pull request Jul 3, 2026
Brings in the 7 commits that landed on main after this sync branch was
originally cut (yesterday's automated main-tip run):
- e00fa55 [skia-sync] Merge upstream chrome/m151 bug fixes (#4312)
- a1ecb75 docs: regenerate API diffs and polish release notes (#4322)
- 1c49b4a Remove unnecessary 'unsafe' modifier from GRContextOptions (#3991)
- 2d15749 Update docs submodule to latest main (#4304)
- 7356c75 [docs-site] Skip PR staging previews for non-site file changes (#4321)
- a95cc35 [docs-site] Add 'Moving faster with AI' dashboard to the AI page (#4318)
- 72ce599 [infra] Remove obsolete skiasharp-docker registry auth (#4310)

Conflicts resolved:
- cgmanifest.json: took origin/main (will be overwritten by
  update-versions.ps1 in the next commit with the new sync SHAs).
- externals/skia: took ours (90a2d04943 is a descendant of 98877992a5
  from PR #4312 via the corresponding submodule merge PR #278).
- docs submodule pointer: took origin/main (b64a0266c from PR #4304).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mattleibow mattleibow added this to the 4.151.0-preview.2 milestone Jul 22, 2026
mattleibow added a commit that referenced this pull request Jul 22, 2026
…e provisioning) (#4522)

[infra] Backport CI fixes to release/4.150.x (#4522)

Context: https://dev.azure.com/dnceng-public/public/_build?definitionId=345
Cherry-picks: #4310, #4320

The new public `mono-SkiaSharp` Azure DevOps pipeline (dnceng-public,
definition 345) failed on `release/4.150.x` at YAML compile time — the build
died in 0s with no timeline before any job ran:

    The pipeline is not valid. Job native_linux_arm64_linux: Step Docker1 input
    containerRegistry references service connection skiasharp-docker which could
    not be found. ... Job native_linux_x86_linux: Step Docker1 ... skiasharp-docker

`main` had already dropped that stale dependency, but `release/4.150.x` was cut
before those fixes, so every run on the branch was a hard compile failure. This
backports the two infra commits needed to make the branch build under the new
pipeline. No product code is touched — only pipeline templates (30 deletions).

Remove obsolete skiasharp-docker registry auth (#4310)

  The native bootstrapper only builds a local image from the checked-in
  Dockerfile and runs it; the private-registry login was obsolete. Removing the
  1ES `authenticatedContainerRegistries` entry and the classic `Docker@2 login`
  task drops the reference to the `skiasharp-docker` service connection, which
  does not exist in the dnceng-public project. This is the change that lets the
  pipeline compile.

Remove Apple certificate and provisioning profile steps from tests (#4320)

  With the compile blocker gone, the iOS/macOS/tvOS test jobs would then fail at
  runtime: `InstallAppleCertificate`/`InstallAppleProvisioningProfile` load
  secure files (`SkiaSharp iOS Certificate.p12`, etc.) that are not present in
  the new public project. Dropping those steps (and the now-unused
  provisioning-profiles template) keeps the test stage runnable.

Verified: after both cherry-picks, PR #4522 triggered build 20260722.23, which
gets past YAML validation and expands all 12 stages (instead of failing
instantly at compile). m151 milestone changes (#4294) were deliberately
excluded — 4.150.x stays on m150.

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants