Merge pull request #751 from myk002/myk_repo_madness

specify repos for new workflows
DFHack · Apr 18, 2024 · 5688615 · 5688615
2 parents e95ba0e + 2f1974e
commit 5688615
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,14 +38,18 @@ jobs:
   test:
     uses: DFHack/dfhack/.github/workflows/test.yml@develop
     with:
-      dfhack_ref: ${{ github.repository_owner == 'DFHack' && (((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name)) || '' }}
+      dfhack_repo: ${{ format('{0}/dfhack', github.event_name == 'push' && github.repository_owner || github.event.pull_request.base.repo.owner.login) }}
+      dfhack_ref: ${{ (((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name)) }}
+      structures_repo: ${{ github.repository }}
       structures_ref: ${{ github.ref }}
     secrets: inherit
 
   docs:
     uses: DFHack/dfhack/.github/workflows/build-linux.yml@develop
     with:
-      dfhack_ref: ${{ github.repository_owner == 'DFHack' && (((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name)) || '' }}
+      dfhack_repo: ${{ format('{0}/dfhack', github.event_name == 'push' && github.repository_owner || github.event.pull_request.base.repo.owner.login) }}
+      dfhack_ref: ${{ (((github.base_ref || github.ref_name) == 'master') && 'develop' || (github.base_ref || github.ref_name)) }}
+      structures_repo: ${{ github.repository }}
       structures_ref: ${{ github.ref }}
       artifact-name: docs
       platform-files: false

diff --git a/.github/workflows/check-type-sizes.yml b/.github/workflows/check-type-sizes.yml
@@ -7,6 +7,7 @@ jobs:
     name: Process sizes (win64, ${{ matrix.desc }})
     uses: DFHack/dfhack/.github/workflows/build-windows.yml@develop
     with:
+      structures_repo: ${{ matrix.repo }}
       structures_ref: ${{ matrix.ref }}
       artifact-name: sizes-Windows-64-${{ matrix.desc }}
       platform-files: false
@@ -17,15 +18,18 @@ jobs:
       matrix:
         include:
         - desc: old
+          repo: ${{ format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
           ref: ${{ github.base_ref }}
         - desc: new
+          repo: ${{ github.repository }}
           ref: ${{ github.ref }}
     secrets: inherit
 
   build-linux:
     name: Process sizes (linux64, ${{ matrix.desc }})
     uses: DFHack/dfhack/.github/workflows/build-linux.yml@develop
     with:
+      structures_repo: ${{ matrix.repo }}
       structures_ref: ${{ matrix.ref }}
       artifact-name: sizes-Linux-64-${{ matrix.desc }}
       platform-files: false
@@ -36,8 +40,10 @@ jobs:
       matrix:
         include:
         - desc: old
+          repo: ${{ format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
           ref: ${{ github.base_ref }}
         - desc: new
+          repo: ${{ github.repository }}
           ref: ${{ github.ref }}
     secrets: inherit