Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/deploy/appinfo/info.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<description><![CDATA[A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.]]></description>
<version>%%VERSION%%</version>
<licence>agpl</licence>
<author mail="[email protected]">Christian Wolf</author>
<author mail="[email protected]">Jeppe Zapp</author>
<namespace>Cookbook</namespace>
<category>organization</category>
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy/create-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ git config user.email '[email protected]'

"$deploy_path/update-data.sh"

git add package.json lib/Controller/MainController.php
git add package.json lib/Controller/MainController.php appinfo/info.xml

git commit -s -m "Bump to version $version"
git tag "v$version"
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,19 @@ jobs:
rsync -a .github/actions/run-tests/volumes/coverage/latest/ /tmp/coverage
if: ${{ steps.run-tests.outputs.silentFail == 'false' }}

- name: Upload the code coverage report (unit tests) as artifacts
- name: Upload the code coverage report for codecov as artifacts
uses: actions/upload-artifact@v2
with:
name: Code coverage (HTML) (${{matrix.database}}, ${{matrix.coreVersion}}, ${{matrix.httpServer}}, ${{matrix.phpVersion}})
path: "/tmp/coverage"
name: Code coverage (XML) (${{matrix.database}}, ${{matrix.coreVersion}}, ${{matrix.httpServer}}, ${{matrix.phpVersion}})
path: "/tmp/coverage/coverage.*.xml"
if: ${{ steps.run-tests.outputs.silentFail == 'false' }}

# - name: Upload the code coverage report (unit tests) as artifacts
# uses: actions/upload-artifact@v2
# with:
# name: Code coverage (HTML) (${{matrix.database}}, ${{matrix.coreVersion}}, ${{matrix.httpServer}}, ${{matrix.phpVersion}})
# path: "/tmp/coverage"
# if: ${{ steps.run-tests.outputs.silentFail == 'false' }}

- name: Upload the junit log file artifact as artifact
uses: actions/upload-artifact@v2
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
- Enable automatically merging of dependabot PRs
- Add code style checker for package.json
[#1053](https://github.com/nextcloud/cookbook/pull/1053) @christianlupus
- Remove the amount of data uploaded in CI artifacts
[#1059](https://github.com/nextcloud/cookbook/pull/1059) @christianlupus

### Documentation
- Add documentation on updates of the API endpoints
Expand Down
3 changes: 2 additions & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
<name>Cookbook</name>
<summary>An integrated cookbook using schema.org JSON files as recipes</summary>
<description><![CDATA[A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.]]></description>
<version>0.9.9</version>
<version>0.9.12</version>
<licence>agpl</licence>
<author mail="[email protected]">Christian Wolf</author>
<author mail="[email protected]">Jeppe Zapp</author>
<namespace>Cookbook</namespace>
<category>organization</category>
Expand Down