Merge pull request #704 from DFHack/master

merge master into 5012-beta
DFHack · Jan 30, 2024 · 817395a · 817395a
2 parents e18faee + f31f52e
commit 817395a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,12 +37,14 @@ jobs:
   test:
     uses: DFHack/dfhack/.github/workflows/test.yml@develop
     with:
+      dfhack_ref: ${{ ((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name) }}
       structures_ref: ${{ github.ref }}
     secrets: inherit
 
   docs:
     uses: DFHack/dfhack/.github/workflows/build-linux.yml@develop
     with:
+      dfhack_ref: ${{ ((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name) }}
       structures_ref: ${{ github.ref }}
       artifact-name: docs
       platform-files: false