Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
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
115 changes: 115 additions & 0 deletions DECISIONS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
# Design Decisions

This document records significant design decisions made during the implementation of the F# Compiler Regression Testing pipeline.

## Decision 1: Template-Based Architecture

**Context**: Need to implement regression testing that can be reused across pipelines.

**Options Considered**:
1. Inline job definitions in azure-pipelines-PR.yml
2. Reusable Azure DevOps template in eng/templates/

**Decision**: Use reusable template approach.

**Rationale**:
- Follows Azure DevOps best practices
- Reduces code duplication
- Makes it easy to extend with new libraries
- Consistent with existing patterns in the repository (eng/common/templates/)

---

## Decision 2: Optimized Artifact Publishing

**Context**: Need to share compiler artifacts between jobs.

**Options Considered**:
1. Publish entire artifacts folder (~1.8GB)
2. Publish only essential directories (fsc and FSharp.Core) (~79MB)

**Decision**: Publish only essential directories.

**Rationale**:
- Reduces artifact size from 1.8GB to ~79MB
- Faster artifact upload/download
- Contains all necessary components for regression testing
- Matches approach in previous PR #18803

---

## Decision 3: Using F# Script for Directory.Build.props Setup

**Context**: Need to inject UseLocalCompiler.Directory.Build.props import into third-party repos.

**Options Considered**:
1. Pure PowerShell XML manipulation
2. F# script with proper XML handling
3. Simple file replacement

**Decision**: Use F# script with XML handling.

**Rationale**:
- Properly handles existing Directory.Build.props files
- Correctly inserts import at beginning of Project element
- Native F# tooling in an F# project
- Matches approach in previous PR #18803

---

## Decision 4: Specific Commit SHAs for Third-Party Libraries

**Context**: Need reproducible regression tests.

**Options Considered**:
1. Use main/master branch
2. Use specific commit SHAs

**Decision**: Use specific commit SHAs.

**Rationale**:
- Ensures reproducible test results
- Protects against breaking changes in third-party libraries
- Allows controlled updates when ready
- Standard practice for regression testing

---

## Decision 5: Removal of Strategy Matrix from EndToEndBuildTests

**Context**: The original EndToEndBuildTests job had a matrix for regular vs experimental features.

**Options Considered**:
1. Keep the matrix and publish artifacts only from one configuration
2. Remove the matrix entirely
3. Publish artifacts from both configurations

**Decision**: Remove the matrix entirely (per previous PR approach).

**Rationale**:
- Simplifies artifact publishing
- Regression tests need consistent baseline
- Both configurations were building with empty experimental flag anyway
- Matches approach in previous PR #18803

---

## Decision 6: Use net10.0 Target Framework in Template

**Context**: The pipeline needs to reference the correct .NET target framework for the compiler artifacts.

**Options Considered**:
1. Hardcode net9.0 (as in PR #18803)
2. Use net10.0 (per current UseLocalCompiler.Directory.Build.props)
3. Make it configurable

**Decision**: Use net10.0 to match the current project state.

**Rationale**:
- The current repository uses .NET 10 SDK
- UseLocalCompiler.Directory.Build.props references net10.0 paths
- The artifacts/bin/fsc/Release/net10.0 directory exists
- PR #18803 used net9.0 because it was based on an older version of the repository
- Using net10.0 ensures compatibility with the current build output

---
79 changes: 79 additions & 0 deletions OBSTACLES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
# Obstacles Encountered

This document tracks any obstacles encountered during the implementation of the Azure DevOps regression testing template.

## Current Obstacles

None at this time.

## Resolved Obstacles

### 1. FSharpPlus Build Failure: `_GetRestoreSettingsPerFramework` Target Missing

**Date:** 2025-11-28

**Symptom:**
```
D:\a\_work\1\TestRepo\src\FSharpPlus.TypeLevel\Providers\FSharpPlus.Providers.fsproj : error MSB4057: The target "_GetRestoreSettingsPerFramework" does not exist in the project. [TargetFramework=net8.0]
```

**Root Cause:**
The artifacts were being downloaded to an incorrect path structure. The UseLocalCompiler.Directory.Build.props file expects:
```xml
<LocalFSharpBuildBinPath>$(LocalFSharpCompilerPath)/artifacts/bin/fsc/$(LocalFSharpCompilerConfiguration)/net10.0</LocalFSharpBuildBinPath>
```

But the artifacts were being downloaded to:
```
$(Pipeline.Workspace)/FSharpCompiler/bin/fsc (missing /artifacts/)
```

This caused the FSharpTargetsShim property to point to a non-existent path, which prevented Microsoft.FSharp.Targets from being imported. Without Microsoft.FSharp.Targets, Microsoft.Common.targets was not imported, which in turn prevented NuGet.targets from being imported - and NuGet.targets is where `_GetRestoreSettingsPerFramework` is defined.

**Investigation Steps:**
1. Used `dotnet msbuild -pp` to compare preprocessed output with and without local compiler
2. Found NuGet.targets was referenced 9 times without local compiler, but only 2 times with local compiler
3. Traced the import chain: FSharpTargetsShim -> Microsoft.FSharp.NetSdk.targets -> Microsoft.FSharp.Targets -> Microsoft.Common.targets -> NuGet.targets
4. Discovered FSharpTargetsShim was pointing to path with doubled `/artifacts/artifacts/`
5. Realized artifact download path didn't match UseLocalCompiler.Directory.Build.props expectations

**Solution:**
Changed the artifact download paths to include `/artifacts/bin/`:
```yaml
downloadPath: '$(Pipeline.Workspace)/FSharpCompiler/artifacts/bin/fsc'
downloadPath: '$(Pipeline.Workspace)/FSharpCompiler/artifacts/bin/FSharp.Core'
```

This ensures the directory structure matches what UseLocalCompiler.Directory.Build.props expects.

**Lessons Learned:**
- UseLocalCompiler.Directory.Build.props has specific path expectations that must be matched exactly
- Use `dotnet msbuild -pp` to debug MSBuild import issues
- The `_GetRestoreSettingsPerFramework` error often indicates broken MSBuild import chain

### 2. Git Submodule Initialization

**Date:** 2025-11-28

**Symptom:**
Type provider source files were missing.

**Root Cause:**
FSharpPlus uses git submodules for `FSharp.TypeProviders.SDK`.

**Solution:**
1. Changed `git clone` to `git clone --recursive` to clone with submodules
2. Added explicit `git submodule update --init --recursive` after `git checkout`

### 3. No Binary Log Files Generated

**Date:** 2025-11-28

**Symptom:**
No `.binlog` files were being collected or published.

**Root Cause:**
The build was failing early before any MSBuild commands could generate binlog files.

**Solution:**
Fixing the path issues above allows the build to proceed, enabling binlog generation.
68 changes: 68 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# TODO: Azure DevOps Template for F# Compiler Regression Testing

## Overview
Implement a reusable Azure DevOps template for F# compiler regression testing, integrated with the existing PR pipeline infrastructure.

## Current Issues (from review feedback)

### Build Failure & Binlog Issues
- [x] Fix binlog collection (was failing due to missing submodules)
- [x] Fix the `_GetRestoreSettingsPerFramework` issue (caused by missing git submodules)
- [x] Add `--recursive` flag to git clone command
- [x] Add explicit `git submodule update --init --recursive` after checkout
- [x] Document findings in OBSTACLES.md

## Tasks

### Infrastructure Setup
- [x] Analyze existing PR pipeline structure (`azure-pipelines-PR.yml`)
- [x] Review previous PR #18803 implementation details
- [x] Understand `UseLocalCompiler.Directory.Build.props` configuration

### Implementation
- [x] Create `eng/templates/` directory
- [x] Create `eng/templates/regression-test-jobs.yml` template
- [x] Define parameters for testMatrix
- [x] Implement job that depends on EndToEndBuildTests
- [x] Add artifact download steps (FSharpCompilerFscArtifacts, FSharpCoreArtifacts, UseLocalCompilerProps)
- [x] Add third-party repo checkout step
- [x] Add .NET SDK installation step
- [x] Add Directory.Build.props setup step referencing standalone F# script
- [x] Add environment reporting step
- [x] Add build execution step
- [x] Add artifact publishing step
- [x] Add result reporting step
- [x] Add optional imageOverride per tested repo

### F# Script for Repository Setup
- [x] Create standalone `eng/scripts/PrepareRepoForRegressionTesting.fsx`
- [x] Test script locally with FSharpPlus repository
- [x] Handle both existing and missing Directory.Build.props cases

### Integration
- [x] Update `azure-pipelines-PR.yml`:
- [x] Modify EndToEndBuildTests to publish focused artifacts
- [x] Remove strategy/matrix section from EndToEndBuildTests
- [x] Add artifact publishing tasks for fsc, FSharp.Core, and UseLocalCompiler props
- [x] Move template invocation to stage level (outside common template)
- [x] Add template invocation with FSharpPlus test matrix

### Documentation
- [x] Create `docs/regression-testing-pipeline.md`
- [x] Purpose and overview
- [x] How it works
- [x] Current test matrix
- [x] Adding new libraries
- [x] Pipeline configuration
- [x] Troubleshooting
- [x] Technical details

### Validation
- [x] Verify YAML syntax is valid
- [x] Verify template structure matches Azure DevOps best practices
- [x] Ensure Release configuration is used throughout
- [x] Test F# script locally with FSharpPlus

## References
- Previous PR: https://github.com/dotnet/fsharp/pull/18803
- Files: `eng/templates/regression-test-jobs.yml`, `azure-pipelines-PR.yml`, `docs/regression-testing-pipeline.md`, `eng/scripts/PrepareRepoForRegressionTesting.fsx`
63 changes: 42 additions & 21 deletions azure-pipelines-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -700,35 +700,39 @@ stages:
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals $(_WindowsMachineQueueName)
strategy:
maxParallel: 2
matrix:
regular:
_experimental_flag: ''
experimental_features:
_experimental_flag: ''
steps:
- checkout: self
clean: true
# We first download a publicly available .NET SDK. That one has support for `path` in global.json. dotnet.cmd script can then download a version which is not yet shipped, but matches global.json.
- task: UseDotNet@2
displayName: install SDK
inputs:
packageType: sdk
version: '10.x'
includePreviewVersions: true
workingDirectory: $(Build.SourcesDirectory)
installationPath: $(Build.SourcesDirectory)/.dotnet
- script: .\Build.cmd -c Release -pack
env:
NativeToolsOnMachine: true
FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c Release
env:
FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
displayName: End to end build tests
- script: .\eng\common\dotnet.cmd fsi .\tests\FSharp.Compiler.ComponentTests\CompilerCompatibilityTests.fsx
displayName: Compiler compatibility tests

# Publish artifacts for regression testing
- task: PublishPipelineArtifact@1
displayName: Publish F# Compiler FSC Artifacts for Regression Tests
inputs:
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/fsc'
artifactName: 'FSharpCompilerFscArtifacts'
publishLocation: pipeline
condition: succeeded()

- task: PublishPipelineArtifact@1
displayName: Publish F# Core Artifacts for Regression Tests
inputs:
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/FSharp.Core'
artifactName: 'FSharpCoreArtifacts'
publishLocation: pipeline
condition: succeeded()

- task: PublishPipelineArtifact@1
displayName: Publish UseLocalCompiler props file for Regression Tests
inputs:
targetPath: '$(Build.SourcesDirectory)/UseLocalCompiler.Directory.Build.props'
artifactName: 'UseLocalCompilerProps'
publishLocation: pipeline
condition: succeeded()

# Up-to-date - disabled due to it being flaky
#- job: UpToDate_Windows
Expand Down Expand Up @@ -881,3 +885,20 @@ stages:
- pwsh: .\tests\ILVerify\ilverify.ps1
displayName: Run ILVerify
workingDirectory: $(Build.SourcesDirectory)

#-------------------------------------------------------------------------------------------------------------------#
# F# Compiler Regression Tests #
#-------------------------------------------------------------------------------------------------------------------#
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- template: /eng/templates/regression-test-jobs.yml
parameters:
testMatrix:
- repo: fsprojects/FSharpPlus
commit: f614035b75922aba41ed6a36c2fc986a2171d2b8
buildScript: build.cmd
displayName: FSharpPlus_Windows
- repo: fsprojects/FSharpPlus
commit: f614035b75922aba41ed6a36c2fc986a2171d2b8
buildScript: build.sh
displayName: FSharpPlus_Linux
useVmImage: $(UbuntuMachineQueueName)
Loading
Loading