From 8bfec02a0048a06b5cbcf6b7955b3012744b5898 Mon Sep 17 00:00:00 2001 From: Alan Rynne <alan@speckle.systems> Date: Mon, 2 Dec 2024 14:31:22 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=A4=A6=F0=9F=8F=BC=E2=80=8D?= =?UTF-8?q?=E2=99=82=EF=B8=8F=20missing=20setup=20msbuild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 12 ++++-------- ci-build/Program.cs | 3 ++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 507f0c8..14a5c7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,18 +21,14 @@ jobs: with: fetch-depth: 0 + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v2 + - name: ⚒️ Run GitVersion run: ./build.ps1 build-server-version - name: Build - run: ./build.ps1 build-cmake - - - name: LS - run: ls - working-directory: build/27/ - - - name: Build sln - run: msbuild build/27/archicad-speckle.sln /p:Configuration=Release + run: ./build.ps1 - uses: actions/upload-artifact@v4 with: diff --git a/ci-build/Program.cs b/ci-build/Program.cs index b29c8f8..98df13c 100644 --- a/ci-build/Program.cs +++ b/ci-build/Program.cs @@ -61,13 +61,14 @@ void RemoveDirectory(string d) Target( BUILD, + DependsOn(RUN_CMAKE), Consts.SupportedVersions, s => { var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild"; var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.9999"; Console.WriteLine($"Version: {version} & {fileVersion}"); - Run("msbuild", $"archicad-speckle.sln /p:Configuration=Release /p:Version={version} /p:FileVersion={fileVersion}", $"./build/{s}/"); + Run("msbuild", $"./build/{s}/archicad-speckle.sln /p:Configuration=Release /p:Version={version} /p:FileVersion={fileVersion}"); } );