diff --git a/.github/workflows/deploy-prerelease.yml b/.github/workflows/deploy-prerelease.yml
new file mode 100644
index 00000000..03f307ee
--- /dev/null
+++ b/.github/workflows/deploy-prerelease.yml
@@ -0,0 +1,24 @@
+name: Deploy Prerelease
+
+on:
+ workflow_run:
+ workflows: [Prerelease]
+ types: [completed]
+
+jobs:
+ deploy:
+ runs-on: ubuntu-latest
+ if: ${{ github.event.workflow_run.conclusion == 'success' }}
+ steps:
+ - name: Install SSH Key
+ uses: shimataro/ssh-key-action@v2
+ with:
+ key: ${{ secrets.SSH_STAGING_PRIVATE_KEY }}
+ known_hosts: ${{ secrets.SSH_STAGING_HOST_FINGERPRINT }}
+ config: |
+ Host *
+ HostKeyAlgorithms ssh-rsa-cert-v01@openssh.com,ssh-rsa
+ StrictHostKeyChecking yes
+
+ - name: Deploy using server side script
+ run: ssh -qT ${{ secrets.SSH_USER }}@${{ secrets.SSH_STAGING_HOST }}
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
new file mode 100644
index 00000000..f2a499c1
--- /dev/null
+++ b/.github/workflows/prerelease.yml
@@ -0,0 +1,54 @@
+name: Prerelease
+
+on:
+ release:
+ types: [prereleased]
+
+env:
+ APP_NAME: adminly_calendar
+
+jobs:
+ prerelease:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ path: ${{ env.APP_NAME }}
+
+ - name: Set up PHP
+ uses: "shivammathur/setup-php@v2"
+ with:
+ php-version: "8.0"
+ tools: composer
+
+ - name: Read package.json node and npm engines version
+ uses: skjnldsv/read-package-engines-version-actions@v1.2
+ id: versions
+ with:
+ path: ./${{ env.APP_NAME }}/
+ fallbackNode: "^14"
+ fallbackNpm: "^7"
+
+ - name: Set up node ${{ steps.versions.outputs.nodeVersion }}
+ uses: actions/setup-node@v3
+ with:
+ node-version: ${{ steps.versions.outputs.nodeVersion }}
+
+ - name: Set up npm ${{ steps.versions.outputs.npmVersion }}
+ run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"
+
+ - name: Build and create tarball
+ run: |
+ cd ${{ env.APP_NAME }}
+ make release
+
+ - name: Upload tarball to release
+ uses: svenstaro/upload-release-action@v2
+ with:
+ repo_token: ${{ secrets.GITHUB_TOKEN }}
+ file: ${{ env.APP_NAME }}/build/${{ env.APP_NAME }}.tar.gz
+ asset_name: ${{ env.APP_NAME }}.tar.gz
+ tag: ${{ github.ref }}
+ overwrite: true
diff --git a/Makefile b/Makefile
index 3727bcf9..1c8d94fe 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
# later. See the LICENSE file.
app_name=adminly_calendar
+app_id=calendar
build_directory=$(CURDIR)/build
temp_build_directory=$(build_directory)/temp
build_tools_directory=$(CURDIR)/build/tools
@@ -102,7 +103,7 @@ build-tarball:
--exclude="Makefile" \
--exclude="package-lock.json" \
--exclude="package.json" \
- ../$(app_name)/ $(temp_build_directory)/$(app_name)
+ ../$(app_name)/ $(temp_build_directory)/$(app_id)
tar czf $(build_directory)/$(app_name).tar.gz \
- -C $(temp_build_directory) $(app_name)
+ -C $(temp_build_directory) $(app_id)
diff --git a/README.md b/README.md
index e768aded..0f88806e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
# Adminly Calendar
This is a fork of [Nextcloud Calendar](https://github.com/nextcloud/calendar)
+
+Based on version 3.4.0
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ee9e2ef7..c8e5512d 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -15,7 +15,7 @@
* ☑️ Tasks! See tasks with a due date directly in the calendar
* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.
]]>
- 103.4.0
+ 100.2.0-alpha1
agpl
Anna Larch
Nextcloud Groupware Team
diff --git a/package.json b/package.json
index 718e5872..79b797d5 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,12 @@
"build": "webpack --node-env production --progress",
"dev": "webpack --node-env development --progress",
"watch": "webpack --node-env development --progress --watch",
- "lint": "eslint --ext .js,.vue src",
- "lint:fix": "eslint --ext .js,.vue src --fix",
- "stylelint": "stylelint src css",
- "stylelint:fix": "stylelint src css --fix",
+ "eslint": "eslint --ext .js,.vue src",
+ "eslint:fix": "eslint --ext .js,.vue src --fix",
+ "stylelint": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue",
+ "stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix",
+ "prettier": "prettier --check .",
+ "prettier:fix": "prettier --write .",
"test": "jest",
"test:coverage": "jest --coverage"
},
@@ -80,8 +82,8 @@
"extends @nextcloud/browserslist-config"
],
"engines": {
- "node": ">=14.0.0",
- "npm": ">=7.0.0"
+ "node": "^14.0.0",
+ "npm": "^7.0.0"
},
"devDependencies": {
"@nextcloud/babel-config": "^1.0.0",