Skip to content

Commit

Permalink
Merge pull request #878 from nextcloud/fix/875-missing-appinfo
Browse files Browse the repository at this point in the history
Reactivate translation integration
  • Loading branch information
christianlupus authored Jan 17, 2022
2 parents d2949da + ceffc31 commit c2270dd
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 33 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/changelog.yml

This file was deleted.

65 changes: 65 additions & 0 deletions .github/workflows/pull-checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@

name: Additinoal tests for pull requests

on:
pull_request:

jobs:

changelog:
name: Check if the changelog was updated
runs-on: ubuntu-latest

steps:
- name: Checkout the app
uses: actions/checkout@v2
with:
fetch-depth: 2

- name: Get the diff
id: diff
run: |
git diff HEAD~1 -- CHANGELOG.md
lines=$(git diff HEAD~1 -- CHANGELOG.md | wc -l)
echo "::set-output name=lines::$lines"
- name: Error if the number of diff lines is zero
run: |
echo "::error file=CHANGELOG.md::There was no change in the changelog detected. Please fill in a valid entry into that file."
exit 1
if: ${{ steps.diff.outputs.lines == 0 }}

appinfo:
name: Check for matching app info file
runs-on: ubuntu-latest

steps:
- name: Checkout of the app
uses: actions/checkout@v2
with:
fetch-depth: 1

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install jq
pip install yq
- name: Perform the test
env:
MAIN_FILE: appinfo/info.xml
DIST_FILE: .github/actions/deploy/appinfo/info.xml.dist
run: |
echo "Normalize the actual appinfo file"
xq -x 'del(.info.version)' "$MAIN_FILE" > /tmp/main-info.xml
xq -x 'del(.info.version)' "$DIST_FILE" > /tmp/dist-info.xml
echo '::group::Debug output'
tail -n 100 /tmp/main-info.xml /tmp/dist-info.xml
echo '::endgroup::'
if ! diff -q /tmp/main-info.xml /tmp/dist-info.xml > /dev/null; then
echo '::error::The app info file differs from the dist file. Please check manually!'
exit 1
fi
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
*.swp
*.swo

/appinfo/info.xml

cookbook.tar.gz

.idea/
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
## [Unreleased]

### Fixed
- Added app info XML back to allow automatic translations
[#878](https://github.com/nextcloud/cookbook/pull/878) @christianlupus


## 0.9.9 - 2022-01-13

### Fixed
- Update NPM plugins to enhance build process
[#868](https://github.com/nextcloud/cookbook/pull/868) @christianlupus
- Removed missing CSS link in guest template
[#869](https://github.com/nextcloud/cookbook/pull/869) @christianlupus
- Avoid usage of deprecated JS function
[#870](https://github.com/nextcloud/cookbook/pull/870) @christianlupus
- Added some translations manually
(see also [#875](https://github.com/nextcloud/cookbook/issues/875)) @nickvergessen


## 0.9.8 - 2021-12-05
Expand Down
29 changes: 29 additions & 0 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0"?>
<!-- Do not alter this file in directly, tweak the template in .github/actions/deploy/info.xml.dist! -->
<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
<id>cookbook</id>
<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>
<licence>agpl</licence>
<author mail="mrzapp@users.noreply.github.com">Jeppe Zapp</author>
<namespace>Cookbook</namespace>
<category>organization</category>
<website>https://github.com/nextcloud/cookbook/</website>
<bugs>https://github.com/nextcloud/cookbook/issues</bugs>
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot1_small.png">https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot1_small.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="7.3"/>
<nextcloud min-version="19" max-version="23"/>
</dependencies>
<navigations>
<navigation>
<name>Cookbook</name>
<route>cookbook.main.index</route>
<icon>app.svg</icon>
</navigation>
</navigations>
</info>
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const path = require('path')
const { VueLoaderPlugin } = require('vue-loader')
const LodashModuleReplacementPlugin = require('lodash-webpack-plugin')
const { CleanWebpackPlugin } = require('clean-webpack-plugin')
const MiniCssExtractPlugin = require("mini-css-extract-plugin")
const MiniCssExtractPlugin = require("mini-css-extract-plugin").default

module.exports = {

Expand Down

0 comments on commit c2270dd

Please sign in to comment.