Skip to content

Commit

Permalink
Merge branch 'develop' into adv-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
myk002 committed Dec 25, 2024
2 parents 4fcc4a5 + 3113554 commit 35c218a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 4 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ on:
default: DFHack/df-structures
structures_ref:
type: string
stonesense_repo:
type: string
default: DFHack/stonesense
stonesense_ref:
type: string
artifact-name:
type: string
append-date-and-hash:
Expand Down Expand Up @@ -107,6 +112,13 @@ jobs:
repository: ${{ inputs.structures_repo }}
ref: ${{ inputs.structures_ref }}
path: library/xml
- name: Clone stonesense
if: inputs.stonesense_ref
uses: actions/checkout@v4
with:
repository: ${{ inputs.stonesense_repo }}
ref: ${{ inputs.stonesense_ref }}
path: plugins/stonesense
- name: Get 3rd party SDKs
if: inputs.launchdf
uses: actions/checkout@v4
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ on:
default: DFHack/df-structures
structures_ref:
type: string
stonesense_repo:
type: string
default: DFHack/stonesense
stonesense_ref:
type: string
artifact-name:
type: string
append-date-and-hash:
Expand Down Expand Up @@ -88,6 +93,13 @@ jobs:
repository: ${{ inputs.structures_repo }}
ref: ${{ inputs.structures_ref }}
path: library/xml
- name: Clone stonesense
if: inputs.stonesense_ref
uses: actions/checkout@v4
with:
repository: ${{ inputs.stonesense_repo }}
ref: ${{ inputs.stonesense_ref }}
path: plugins/stonesense
- name: Get 3rd party SDKs
if: inputs.launchdf
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clean-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
- name: Check out code
uses: actions/checkout@v4
- name: Cleanup
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh extension install actions/gh-actions-cache
Expand All @@ -28,5 +30,3 @@ jobs:
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
done
echo "Done"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion plugins/stonesense
Submodule stonesense updated 240 files
2 changes: 1 addition & 1 deletion scripts

0 comments on commit 35c218a

Please sign in to comment.