From 3a96808aa5ef46d70fc7b607441b142e67b434d9 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Wed, 13 Dec 2023 17:36:05 +0100 Subject: [PATCH 1/3] Update msbuild.yml --- .github/workflows/msbuild.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 7121b0dc..bdb5fc75 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -3,12 +3,6 @@ name: Backend build on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] - -env: - SOLUTION_FILE_PATH: ./src/olympus.sln - BUILD_CONFIGURATION: Release permissions: contents: read @@ -23,18 +17,21 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - - name: Install packages and dependencies + - name: Setup vcpkg run: | bootstrap-vcpkg vcpkg integrate install + + - name: Setup Node.js + uses: actions/setup-node@v2 - name: Build - working-directory: ${{env.GITHUB_WORKSPACE}} - run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} + working-directory: . + run: build_package.bat - name: Upload a Build Artifact uses: actions/upload-artifact@v3.1.3 with: - name: binaries - path: bin/*.dll + name: Installer + path: installer/Output/*.exe From e2e3da6a0fa1af631aa1cd99a78857388ff68b96 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Wed, 13 Dec 2023 17:37:11 +0100 Subject: [PATCH 2/3] Update msbuild.yml --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index bdb5fc75..abd46523 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -27,7 +27,7 @@ jobs: - name: Build working-directory: . - run: build_package.bat + run: call build_package.bat - name: Upload a Build Artifact uses: actions/upload-artifact@v3.1.3 From cbf4b56ecb8a56f8409c9dedf833125bc2032875 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Wed, 13 Dec 2023 17:39:18 +0100 Subject: [PATCH 3/3] Update msbuild.yml --- .github/workflows/msbuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index abd46523..c10369a3 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -27,7 +27,8 @@ jobs: - name: Build working-directory: . - run: call build_package.bat + run: "./build_package.bat" + shell: cmd - name: Upload a Build Artifact uses: actions/upload-artifact@v3.1.3