Skip to content

Make the app compatible to NC server 30 #2493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 12, 2024
Merged

Make the app compatible to NC server 30 #2493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a62896f
Formally make the app compatible with NC 30
christianlupus Sep 12, 2024
c910fa0
Fix a warning of vue compiler about SCSS ordering
christianlupus Sep 12, 2024
7bc47fc
Fix hook to download XSD file first
christianlupus Sep 12, 2024
87da00f
Update Changelog
christianlupus Sep 12, 2024
ffb4635
Fix gitignore file
christianlupus Sep 12, 2024
d04e412
Extend GH test configuration
christianlupus Sep 12, 2024
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
3 changes: 3 additions & 0 deletions .changelog/current/2493-compatibility-nc-30.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Maintenance

- Mark the app as compatible with NC 30
2 changes: 1 addition & 1 deletion .github/actions/deploy/appinfo/info.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="7.4"/>
<nextcloud min-version="28" max-version="29"/>
<nextcloud min-version="28" max-version="30"/>
</dependencies>
<navigations>
<navigation>
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
database:
- mysql
coreVersion:
- 28
- 30
phpVersion:
- "8.3"
httpServer:
Expand All @@ -124,7 +124,7 @@ jobs:
phpVersion: "8.1"
httpServer: "apache"
- database: pgsql
coreVersion: 28
coreVersion: 29
phpVersion: "8.2"
httpServer: "nginx"

Expand Down
1 change: 1 addition & 0 deletions .hook-checkout/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/checkout
/tmp
7 changes: 4 additions & 3 deletions .hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ if [ -n "$run_check" ]
then

# Clean current folder
rm -rf .hook-checkout/checkout
mkdir .hook-checkout/checkout
rm -rf .hook-checkout/checkout .hook-checkout/tmp
mkdir .hook-checkout/checkout .hook-checkout/tmp

# Clone the latest code base to the folder and apply the staged changes
git archive --format tar $localRef | tar x -C .hook-checkout/checkout
Expand Down Expand Up @@ -119,7 +119,8 @@ then
cd .hook-checkout/checkout
if [ -x "$(which xmllint)" ]
then
xmllint --noout --quiet --schema <(curl -sL 'https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd') appinfo/info.xml || { \
curl -sL 'https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd' -o '../tmp/info.xsd'
xmllint --noout --quiet --schema ../tmp/info.xsd appinfo/info.xml || { \
echo 'The app info file does not conform the XSD file.'; (( retVal |= 64 )); }
else
echo 'WARNING: Could not check the XML file as xmllint was not found in the path.'
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<screenshot>https://raw.githubusercontent.com/nextcloud/cookbook/stable/img/screenshot2.png</screenshot>
<dependencies>
<php min-version="7.4"/>
<nextcloud min-version="28" max-version="29"/>
<nextcloud min-version="28" max-version="30"/>
</dependencies>
<navigations>
<navigation>
Expand Down
6 changes: 3 additions & 3 deletions src/components/RecipeView/RecipeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1160,15 +1160,15 @@ main {
.recipeYieldInput {
width: 75px;

/* Firefox */
-moz-appearance: textfield;

/* Chrome, Safari, Edge */
&::-webkit-inner-spin-button,
&::-webkit-outer-spin-button {
margin: 0;
-webkit-appearance: none;
}

/* Firefox */
-moz-appearance: textfield;
}
</style>

Expand Down