From 06c803e80e38d5a4117140596eb86065b95800fa Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:25:06 +0200 Subject: [PATCH 1/2] Update setup_build.yml --- .github/workflows/setup_build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/setup_build.yml b/.github/workflows/setup_build.yml index b43a87f3f..0452a73b9 100644 --- a/.github/workflows/setup_build.yml +++ b/.github/workflows/setup_build.yml @@ -1,7 +1,13 @@ name: Build CEA Setup on: - workflow_dispatch + workflow_dispatch: + inputs: + gui-branch: + description: 'Branch of GUI repo to build with' + required: true + type: string + default: 'master' jobs: build_win_setup: @@ -59,6 +65,7 @@ jobs: with: path: gui repository: architecture-building-systems/CityEnergyAnalyst-GUI + ref: ${{ inputs.gui-branch }} - uses: actions/setup-node@v4 with: @@ -120,6 +127,7 @@ jobs: with: path: gui repository: architecture-building-systems/CityEnergyAnalyst-GUI + ref: ${{ inputs.gui-branch }} - name: Fetch micromamba run: | From 352a56d6b8da80681d0467df38ca7c1c0a850957 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:22:19 +0200 Subject: [PATCH 2/2] Fetch all branches during checkout Try to fix yarn error "Usage Error: No ancestor could be found between any of HEAD and master, origin/master, upstream/master, main, origin/main, upstream/main" --- .github/workflows/setup_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/setup_build.yml b/.github/workflows/setup_build.yml index 0452a73b9..615f53dea 100644 --- a/.github/workflows/setup_build.yml +++ b/.github/workflows/setup_build.yml @@ -66,6 +66,7 @@ jobs: path: gui repository: architecture-building-systems/CityEnergyAnalyst-GUI ref: ${{ inputs.gui-branch }} + fetch-depth: 0 - uses: actions/setup-node@v4 with: @@ -128,6 +129,7 @@ jobs: path: gui repository: architecture-building-systems/CityEnergyAnalyst-GUI ref: ${{ inputs.gui-branch }} + fetch-depth: 0 - name: Fetch micromamba run: |