Skip to content

fix: remove checkout:self and fix paths for OneBranch checkout convention #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msftsiwei merged 1 commit into from
Apr 20, 2026
Merged

fix: remove checkout:self and fix paths for OneBranch checkout convention #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/sign-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# How it works:
# - ADO pipeline is configured to use this YAML from the tgrep GitHub repo
# - OneBranch checks out tgrep source to $(Build.SourcesDirectory)\s via 'checkout: self'
# - OneBranch auto-checks out tgrep source to $(Build.SourcesDirectory)\s (no checkout: self needed)
# (OneBranch convention: single-repo checkout lands in the 's' subdirectory)
# - Rust is installed via RustInstaller@1 (official Microsoft ADO task)
# - Cargo is authenticated to ADO DeepPrompt feed via CargoAuthenticate@0
Expand Down Expand Up @@ -134,7 +134,7 @@ extends:
# of truth; it has been removed since it is no longer referenced.)
# ---------------------------------------------------------------
- powershell: |
$dstDir = "$(Build.SourcesDirectory)\tgrep\.cargo"
$dstDir = "$(Build.SourcesDirectory)\s\.cargo"
New-Item -ItemType Directory -Force -Path $dstDir | Out-Null
$lines = @(
'[registries.devdiv-deepprompt]',
Expand Down Expand Up @@ -165,23 +165,23 @@ extends:
- task: CargoAuthenticate@0
displayName: 'Authenticate with ADO DeepPrompt Cargo feed'
inputs:
configFile: 'tgrep/.cargo/config.toml'
configFile: 's/.cargo/config.toml'

# ---------------------------------------------------------------
# Step 6: Build Windows x64 release binary
# ---------------------------------------------------------------
- script: |
cargo build --release --locked -p tgrep-cli --bin tgrep --target x86_64-pc-windows-msvc
displayName: 'Build tgrep Windows x64'
workingDirectory: $(Build.SourcesDirectory)\tgrep
workingDirectory: $(Build.SourcesDirectory)\s

# ---------------------------------------------------------------
# Step 7: Verify binary exists
# ---------------------------------------------------------------
- script: |
dir target\x86_64-pc-windows-msvc\release\tgrep.exe
displayName: 'Verify tgrep.exe exists'
workingDirectory: $(Build.SourcesDirectory)\tgrep
workingDirectory: $(Build.SourcesDirectory)\s

# ---------------------------------------------------------------
# Step 8: Sign tgrep.exe using OneBranch signing
Expand All @@ -195,7 +195,7 @@ extends:
command: "sign"
signing_profile: "external_distribution"
files_to_sign: "tgrep.exe"
search_root: "$(Build.SourcesDirectory)/tgrep/target/x86_64-pc-windows-msvc/release"
search_root: "$(Build.SourcesDirectory)/s/target/x86_64-pc-windows-msvc/release"

# ---------------------------------------------------------------
# Step 9: Package signed binary
Expand All @@ -204,8 +204,8 @@ extends:
- powershell: |
$tag = "$(TGREP_TAG)"
$zipName = "tgrep-$tag-x86_64-pc-windows-msvc.zip"
$exePath = "$(Build.SourcesDirectory)/tgrep/target/x86_64-pc-windows-msvc/release/tgrep.exe"
$readmePath = "$(Build.SourcesDirectory)/tgrep/README.md"
$exePath = "$(Build.SourcesDirectory)/s/target/x86_64-pc-windows-msvc/release/tgrep.exe"
$readmePath = "$(Build.SourcesDirectory)/s/README.md"
$outPath = "$(Build.ArtifactStagingDirectory)/$zipName"
Compress-Archive -Path $exePath, $readmePath -DestinationPath $outPath
Write-Host "Packaged: $zipName"
Expand Down Expand Up @@ -269,7 +269,7 @@ extends:
displayName: 'Verify Rust version'

- powershell: |
$dstDir = "$(Build.SourcesDirectory)\tgrep\.cargo"
$dstDir = "$(Build.SourcesDirectory)\s\.cargo"
New-Item -ItemType Directory -Force -Path $dstDir | Out-Null
$lines = @(
'[registries.devdiv-deepprompt]',
Expand Down Expand Up @@ -297,31 +297,31 @@ extends:
- task: CargoAuthenticate@0
displayName: 'Authenticate with ADO DeepPrompt Cargo feed'
inputs:
configFile: 'tgrep/.cargo/config.toml'
configFile: 's/.cargo/config.toml'

- script: |
cargo build --release --locked -p tgrep-cli --bin tgrep --target aarch64-pc-windows-msvc
displayName: 'Build tgrep Windows arm64 (cross-compile)'
workingDirectory: $(Build.SourcesDirectory)\tgrep
workingDirectory: $(Build.SourcesDirectory)\s

- script: |
dir target\aarch64-pc-windows-msvc\release\tgrep.exe
displayName: 'Verify tgrep.exe (arm64) exists'
workingDirectory: $(Build.SourcesDirectory)\tgrep
workingDirectory: $(Build.SourcesDirectory)\s

- task: onebranch.pipeline.signing@1
displayName: 'Sign tgrep.exe (arm64)'
inputs:
command: "sign"
signing_profile: "external_distribution"
files_to_sign: "tgrep.exe"
search_root: "$(Build.SourcesDirectory)/tgrep/target/aarch64-pc-windows-msvc/release"
search_root: "$(Build.SourcesDirectory)/s/target/aarch64-pc-windows-msvc/release"

- powershell: |
$tag = "$(TGREP_TAG)"
$zipName = "tgrep-$tag-aarch64-pc-windows-msvc.zip"
$exePath = "$(Build.SourcesDirectory)/tgrep/target/aarch64-pc-windows-msvc/release/tgrep.exe"
$readmePath = "$(Build.SourcesDirectory)/tgrep/README.md"
$exePath = "$(Build.SourcesDirectory)/s/target/aarch64-pc-windows-msvc/release/tgrep.exe"
$readmePath = "$(Build.SourcesDirectory)/s/README.md"
$outPath = "$(Build.ArtifactStagingDirectory)/$zipName"
Compress-Archive -Path $exePath, $readmePath -DestinationPath $outPath
Write-Host "Packaged: $zipName"
Expand Down
Loading