chore: prepare v1.2.8

callmemagnus · Sep 30, 2024 · a90402e · a90402e
1 parent af46c85
commit a90402e
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 753 deletions.
diff --git a/.github/workflows/release-pre.yml b/.github/workflows/release-pre.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ["8.1"]
-        nextcloud: ["stable27"]
+        nextcloud: ["stable29"]
         database: ["sqlite"]
     steps:
       - name: Checkout
@@ -58,7 +58,7 @@ jobs:
           app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}
 
       - name: Upload app tarball to release
-        uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
+        uses: svenstaro/upload-release-action@v2
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -68,7 +68,7 @@ jobs:
           overwrite: true
 
       - name: Upload app to Nextcloud appstore
-        uses: R0Wi/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1
+        uses: R0Wi/nextcloud-appstore-push-action@v1
         with:
           app_name: ${{ env.APP_NAME }}
           appstore_token: ${{ secrets.APPSTORE_TOKEN }}

diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -59,7 +59,7 @@ jobs:
           app_public_crt: ${{ secrets.APP_PUBLIC_CRT }}
 
       - name: Upload app tarball to release
-        uses: svenstaro/upload-release-action@483c1e56f95e88835747b1c7c60581215016cbf2
+        uses: svenstaro/upload-release-action@v2
         id: attach_to_release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -69,7 +69,7 @@ jobs:
           overwrite: true
 
       - name: Upload app to Nextcloud appstore
-        uses: R0Wi/nextcloud-appstore-push-action@a011fe619bcf6e77ddebc96f9908e1af4071b9c1
+        uses: R0Wi/nextcloud-appstore-push-action@v1
         with:
           app_name: ${{ env.APP_NAME }}
           appstore_token: ${{ secrets.APPSTORE_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [v1.2.8](https://github.com/callmemagnus/nextcloud-searchpage/compare/v1.2.7...v1.2.8)
+
+- translations updates
+- change Nextcloud compatibility to 26 ➙ 30
+
 ## [v1.2.7](https://github.com/callmemagnus/nextcloud-searchpage/compare/v1.2.6...v1.2.7)
 
 - translations updates

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -41,7 +41,7 @@ Known issues with other applications:
 Don't hesitate to leave a comment here or a rating!
 
     ]]></description>
-    <version>1.2.7</version>
+    <version>1.2.8</version>
     <licence>agpl</licence>
     <author mail="[email protected]" homepage="https://magnus.anderssen.ch">Magnus Anderssen</author>
     <namespace>TheSearchPage</namespace>
@@ -51,7 +51,7 @@ Don't hesitate to leave a comment here or a rating!
 	<repository type="git">https://github.com/callmemagnus/nextcloud-searchpage.git</repository>
 	<screenshot>https://raw.githubusercontent.com/callmemagnus/nextcloud-searchpage/main/screenshots/main.png</screenshot>
     <dependencies>
-        <nextcloud min-version="26" max-version="29"/>
+        <nextcloud min-version="26" max-version="30"/>
     </dependencies>
     <navigations>
         <navigation>

diff --git a/bin/start-test-env.sh b/bin/start-test-env.sh
@@ -4,14 +4,24 @@ pwd=$(dirname `readlink -f $0`)
 
 echo $pwd
 
+docker run                  \
+    --rm                    \
+    -d                      \
+    --name nextcloud30      \
+    -p 8030:80              \
+    -v /tmp/nextcloud/30:/var/www/html \
+    -v $pwd/..:/var/www/html/apps-extra/thesearchpage \
+    -e SERVER_BRANCH=v30.0.0 \
+    ghcr.io/juliushaertl/nextcloud-dev-php83:latest
+
 docker run                  \
     --rm                    \
     -d                      \
     --name nextcloud29      \
     -p 8029:80              \
     -v /tmp/nextcloud/29:/var/www/html \
     -v $pwd/..:/var/www/html/apps-extra/thesearchpage \
-    -e SERVER_BRANCH=v29.0.0rc5 \
+    -e SERVER_BRANCH=v29.0.6 \
     ghcr.io/juliushaertl/nextcloud-dev-php83:latest
 
 docker run                  \
@@ -21,7 +31,7 @@ docker run                  \
     -p 8028:80              \
     -v /tmp/nextcloud/28:/var/www/html \
     -v $pwd/..:/var/www/html/apps-extra/thesearchpage \
-    -e SERVER_BRANCH=v28.0.4 \
+    -e SERVER_BRANCH=v28.0.10 \
     ghcr.io/juliushaertl/nextcloud-dev-php83:latest
 
 docker run                  \
@@ -31,42 +41,91 @@ docker run                  \
     -p 8027:80              \
     -v /tmp/nextcloud/27:/var/www/html \
     -v $pwd/..:/var/www/html/apps-extra/thesearchpage \
-    -e SERVER_BRANCH=v27.1.8 \
+    -e SERVER_BRANCH=v27.1.11 \
     ghcr.io/juliushaertl/nextcloud-dev-php82:latest
 
-echo "Waiting 40 seconds"
+docker run                  \
+    --rm                    \
+     -d                     \
+    --name nextcloud26      \
+    -p 8026:80              \
+    -v /tmp/nextcloud/26:/var/www/html \
+    -v $pwd/..:/var/www/html/apps-extra/thesearchpage \
+    -e SERVER_BRANCH=v26.0.13 \
+    ghcr.io/juliushaertl/nextcloud-dev-php82:latest
 
+echo "Trying to install the application..."
 
+# while true
+# do
+#     sleep 1s
+#     result=$(docker exec -u 33 nextcloud30 php occ app:enable thesearchpage)
+#     if [[ "$result" =~ enabled ]]
+#     then
+#         echo "30 - $result" 
+#         break
+#     fi
+# done
 
-while true
+for i in 30 29 28 27 26;
 do
-    sleep 1s
-    result=$(docker exec -u 33 nextcloud29 php occ app:enable thesearchpage)
-    if [[ "$result" =~ enabled ]]
-    then
-        echo "29 - $result" 
-        break
-    fi
+    echo Enabling on $i
+    while true
+    do
+        echo "Testing $i..."
+        result=$(docker exec -u 33 nextcloud$i php occ app:enable thesearchpage)
+        echo "$i: $result"
+        if [[ "$result" =~ "enabled" ]];
+        then
+            break
+        else
+            sleep 1
+        fi
+    done
 done
 
-while true
-do
-    sleep 1s
-    docker exec -u 33 nextcloud28 php occ app:enable thesearchpage
-    if [[ "$result" =~ enabled ]] 
-    then
-        echo "28 - $result" 
-        break
-    fi
-done
+# while true
+# do
+#     sleep 1s
+#     result=$(docker exec -u 33 nextcloud29 php occ app:enable thesearchpage)
+#     if [[ "$result" =~ enabled ]]
+#     then
+#         echo "29 - $result" 
+#         break
+#     fi
+# done
 
-while true
-do
-    sleep 1s
-    docker exec -u 33 nextcloud27 php occ app:enable thesearchpage
-    if [[ "$result" =~ enabled ]]
-    then
-        echo "27 - $result" 
-        break
-    fi
-done
+# while true
+# do
+#     sleep 1s
+#     docker exec -u 33 nextcloud28 php occ app:enable thesearchpage
+#     if [[ "$result" =~ enabled ]] 
+#     then
+#         echo "28 - $result" 
+#         break
+#     fi
+# done
+
+# while true
+# do
+#     sleep 1s
+#     docker exec -u 33 nextcloud27 php occ app:enable thesearchpage
+#     if [[ "$result" =~ enabled ]]
+#     then
+#         echo "27 - $result" 
+#         break
+#     fi
+# done
+
+
+
+# while true
+# do
+#     sleep 1s
+#     docker exec -u 33 nextcloud26 php occ app:enable thesearchpage
+#     if [[ "$result" =~ enabled ]]
+#     then
+#         echo "26 - $result" 
+#         break
+#     fi
+# done
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
       "composer/package-versions-deprecated": true
     },
     "platform": {
-      "php": "8.0"
+      "php": "8.1"
     }
   },
   "autoload": {
@@ -38,4 +38,4 @@
       "OCA\\TheSearchPage\\": "lib/"
     }
   }
-}
+}