From b982c5acef91287da4fae514e420ff544cdfa30f Mon Sep 17 00:00:00 2001 From: Prathik Rao Date: Wed, 22 Apr 2026 15:15:09 -0700 Subject: [PATCH 1/2] osx-arm64 --- .pipelines/templates/build-core-steps.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.pipelines/templates/build-core-steps.yml b/.pipelines/templates/build-core-steps.yml index c21e0b92..d4521720 100644 --- a/.pipelines/templates/build-core-steps.yml +++ b/.pipelines/templates/build-core-steps.yml @@ -119,8 +119,7 @@ steps: projects: '$(nsRoot)/src/FoundryLocalCore/Core/Core.csproj' arguments: '--no-restore -r ${{ parameters.flavor }} /p:Platform=${{ parameters.platform }} /p:IncludeWebService=true /p:Configuration=Release' - # FLC tests on osx-arm64 are flaky in CI, will investigate separately. Skip for now since the main goal of this job is to produce the AOT binary. - - ${{ if or(eq(parameters.flavor, 'win-x64'), eq(parameters.flavor, 'linux-x64')) }}: + - ${{ if or(eq(parameters.flavor, 'win-x64'), eq(parameters.flavor, 'linux-x64'), eq(parameters.flavor, 'osx-arm64')) }}: - task: DotNetCoreCLI@2 displayName: 'Restore FLC Tests ${{ parameters.flavor }}' inputs: From b99021f4a14b931c606c44d6ef25bd5ac4ea1f9d Mon Sep 17 00:00:00 2001 From: Prathik Rao Date: Thu, 23 Apr 2026 14:08:57 -0700 Subject: [PATCH 2/2] lfs fix --- .pipelines/foundry-local-packaging.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.pipelines/foundry-local-packaging.yml b/.pipelines/foundry-local-packaging.yml index bf05607f..ac2927f1 100644 --- a/.pipelines/foundry-local-packaging.yml +++ b/.pipelines/foundry-local-packaging.yml @@ -203,12 +203,13 @@ extends: parameters: repoName: neutron-server ref: refs/heads/${{ parameters.neutronServerBranch }} + # AcesShared macOS agents don't have git-lfs pre-installed. + # Must be installed before checking out test-data-shared so LFS files are pulled. + - script: brew install git-lfs && git lfs install + displayName: 'Install Git LFS' - template: .pipelines/templates/checkout-steps.yml@self parameters: repoName: test-data-shared - # AcesShared macOS agents don't have git-lfs pre-installed - - script: brew install git-lfs && git lfs install - displayName: 'Install Git LFS' - template: .pipelines/templates/build-core-steps.yml@self parameters: flavor: osx-arm64