diff options
| -rw-r--r-- | .github/workflows/appstore-build-publish.yml | 26 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml index ffc9e6e..a7f7ec6 100644 --- a/.github/workflows/appstore-build-publish.yml +++ b/.github/workflows/appstore-build-publish.yml @@ -46,6 +46,7 @@ jobs: - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@v1.1 id: versions + # Continue if no package.json continue-on-error: true with: path: ${{ env.APP_NAME }} @@ -53,12 +54,14 @@ jobs: fallbackNpm: '^6' - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + # Skip if no package.json if: ${{ steps.versions.outputs.nodeVersion }} uses: actions/setup-node@v2 with: node-version: ${{ steps.versions.outputs.nodeVersion }} - name: Set up npm ${{ steps.versions.outputs.npmVersion }} + # Skip if no package.json if: ${{ steps.versions.outputs.npmVersion }} run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}" @@ -68,7 +71,20 @@ jobs: php-version: ${{ env.PHP_VERSION }} coverage: none + - name: Check composer.json + id: check_composer + uses: andstor/file-existence-action@v1 + with: + files: "${{ env.APP_NAME }}/composer.json" + + - name: Install composer dependencies + if: steps.check_composer.outputs.files_exists == 'true' + run: | + cd ${{ env.APP_NAME }} + composer install --no-dev + - name: Build ${{ env.APP_NAME }} + # Skip if no package.json if: ${{ steps.versions.outputs.nodeVersion }} run: | cd ${{ env.APP_NAME }} @@ -76,16 +92,26 @@ jobs: npm run build - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} + # Try krankerl, fallback to makefile run: | cd ${{ env.APP_NAME }} krankerl package || make appstore - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }} + continue-on-error: true + id: server-checkout run: | NCVERSION=${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }} wget --quiet https://download.nextcloud.com/server/releases/latest-$NCVERSION.zip unzip latest-$NCVERSION.zip + - name: Checkout server master fallback + uses: actions/checkout@v2 + if: ${{ steps.server-checkout.outcome != 'success' }} + with: + repository: nextcloud/server + path: nextcloud + - name: Sign app run: | # Extracting release diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f34c6a..2bc3633 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog All notable changes to this project will be documented in this file. -## 3.10.1 – 2021-11-09 +## 3.10.2 – 2021-11-09 ### Fixed - Compatibility with Nextcloud 23 diff --git a/appinfo/info.xml b/appinfo/info.xml index 97c5b72..06bd4eb 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -29,7 +29,7 @@ More information is available in the External sites documentation.]]></descripti <bugs>https://github.com/nextcloud/external/issues</bugs> <repository>https://github.com/nextcloud/external.git</repository> - <version>3.10.1</version> + <version>3.10.2</version> <namespace>External</namespace> <dependencies> |