Skip to content

Commit

Permalink
Merge pull request #807 from matty0ung/dbFixes
Browse files Browse the repository at this point in the history
Fix for DefaultContent004-MoreYeasts.json not in cmake files
  • Loading branch information
matty0ung authored Aug 11, 2024
2 parents 8bba17e + 41ccce4 commit 38a3be6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
#
os: [ubuntu-22.04, ubuntu-24.04]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
build-mac:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
#
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
]
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: temp
fetch-depth: 0
Expand Down
1 change: 1 addition & 0 deletions CHANGES.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Minor bug fixes for the 4.0.0 release (ie bugs in 4.0.0 are fixed in this 4.0.1

### Bug Fixes
* Windows installation blocked by Data Conversion failure [804](https://github.com/Brewtarget/brewtarget/issues/804)
* DefaultContent004-MoreYeasts.json not in cmake files [806](https://github.com/Brewtarget/brewtarget/issues/806)

### Release Timestamp
Thu, 8 Aug 2024 04:00:01 +0100
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,8 @@ set(filesToInstall_docs ${repoDir}/README.md)
set(filesToInstall_data ${repoDir}/data/default_db.sqlite
${repoDir}/data/DefaultContent001-OriginalDefaultData.xml
${repoDir}/data/DefaultContent002-BJCP_2021_Styles.json
${repoDir}/data/DefaultContent003-Ingredients-Hops-Yeasts.json)
${repoDir}/data/DefaultContent003-Ingredients-Hops-Yeasts.json
${repoDir}/data/DefaultContent004-MoreYeasts.json)

# Desktop files to install.
set(filesToInstall_desktop ${repoDir}/linux/${PROJECT_NAME}.desktop)
Expand Down

0 comments on commit 38a3be6

Please sign in to comment.