From 5adf31cea3a29e5cd5e82f9e05ac13728b574ce7 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:09:42 +0200 Subject: [PATCH 01/12] Create makefile.yml --- .github/workflows/makefile.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/makefile.yml diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml new file mode 100644 index 00000000..8789c17b --- /dev/null +++ b/.github/workflows/makefile.yml @@ -0,0 +1,27 @@ +name: Makefile CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: configure + run: ./configure + + - name: Install dependencies + run: make + + - name: Run check + run: make check + + - name: Run distcheck + run: make distcheck From e4040bdb939bedf8c9294ef5fb8677cc3d0cdec1 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:11:38 +0200 Subject: [PATCH 02/12] remove configure --- .github/workflows/makefile.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 8789c17b..fd652ec5 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -14,9 +14,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: configure - run: ./configure - - name: Install dependencies run: make From 9d6b02d05a1e79eea5db2b0f8b482e1abb183987 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:16:03 +0200 Subject: [PATCH 03/12] only use make --- .github/workflows/makefile.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index fd652ec5..db97f8b8 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -16,9 +16,3 @@ jobs: - name: Install dependencies run: make - - - name: Run check - run: make check - - - name: Run distcheck - run: make distcheck From 807117714469b77d4e58f911435b7aa8cabb7fc7 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:30:16 +0200 Subject: [PATCH 04/12] build and create artifact --- .github/workflows/makefile.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index db97f8b8..3e107621 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -14,5 +14,13 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install dependencies - run: make + - name: Build + run: make build + + - name: Create artifact + run: make appstore + + - uses: actions/upload-artifact@v4 + with: + name: gdata-antivirus + path: build/artifact From 7ea2610c1216a9b073654f28baf19fb5e3ebdb60 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:33:27 +0200 Subject: [PATCH 05/12] rename path --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 3e107621..219f4b2b 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -23,4 +23,4 @@ jobs: - uses: actions/upload-artifact@v4 with: name: gdata-antivirus - path: build/artifact + path: build/artifacts From fbe122a0ba0f4adaf12d3e8a3658f51ec677b99f Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:44:47 +0200 Subject: [PATCH 06/12] create release --- .github/workflows/makefile.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 219f4b2b..9ade4cdb 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -20,7 +20,8 @@ jobs: - name: Create artifact run: make appstore - - uses: actions/upload-artifact@v4 + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/') with: - name: gdata-antivirus - path: build/artifacts + files: build/artifacts/* From b80bd544d3d437e4c06381dc9223d4bea0a0d19e Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:48:11 +0200 Subject: [PATCH 07/12] also build on tags --- .github/workflows/makefile.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 9ade4cdb..a583bd36 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -3,6 +3,7 @@ name: Makefile CI on: push: branches: [ "main" ] + tags: [ "*" ] pull_request: branches: [ "main" ] From c7db578bd30c0d050ffc4f5cad85f9d6f9a0ce10 Mon Sep 17 00:00:00 2001 From: doxthree Date: Fri, 17 May 2024 10:54:11 +0200 Subject: [PATCH 08/12] setup node --- .github/workflows/makefile.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index a583bd36..6768b285 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -15,6 +15,11 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + name: setup node + with: + node-version: 20 + - name: Build run: make build From 15499ad2c2c1a2244fb19879f590eea47f2b2fb2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 17 May 2024 09:07:04 +0000 Subject: [PATCH 09/12] Add renovate.json --- renovate.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..7190a60b --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json" +} From b79a41b15fd15e89d0ea0df4ffc0b4da93d04de1 Mon Sep 17 00:00:00 2001 From: unglaublicherdude Date: Fri, 17 May 2024 12:14:56 +0200 Subject: [PATCH 10/12] upgrade dependencies --- install | 12 ++++++++++++ package.json | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 install diff --git a/install b/install new file mode 100644 index 00000000..f02b5ce1 --- /dev/null +++ b/install @@ -0,0 +1,12 @@ +docker run -d --name nextcloud-container --rm --publish 80:80 --publish 8080:8080 --publish 8443:8443 nextcloud:stable +wait 6 +docker exec --user www-data -it nextcloud-container php occ maintenance:install --admin-user=admin --admin-pass= +make build +docker exec --user www-data -it nextcloud-container mkdir apps/gdatavaas +docker cp ./ nextcloud-container:/var/www/html/apps/gdatavaas +docker exec --user www-data -it nextcloud-container php occ app:update --all +docker exec --user www-data -it nextcloud-container php occ app:enable gdatavaas + +docker exec --user www-data -it nextcloud-container php occ config:app:set gdatavaas username --value=vaas-integration-test + +docker exec --user www-data -it nextcloud-container php cron.php diff --git a/package.json b/package.json index 3bbbe4b5..577cd0bf 100644 --- a/package.json +++ b/package.json @@ -21,23 +21,23 @@ }, "dependencies": { "@mdi/svg": "^7.4.47", - "@nextcloud/axios": "^1.10.0", - "@nextcloud/dialogs": "^3.1.4", - "@nextcloud/files": "^3.1.0", - "@nextcloud/router": "^2.0.0" + "@nextcloud/axios": "^2.5.0", + "@nextcloud/dialogs": "^5.3.1", + "@nextcloud/files": "^3.2.1", + "@nextcloud/router": "^3.0.1" }, "browserslist": [ "extends @nextcloud/browserslist-config" ], "engines": { - "node": "^16.0.0", - "npm": "^7.0.0 || ^8.0.0" + "node": "^20.0.0", + "npm": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0" }, "devDependencies": { - "@nextcloud/babel-config": "^1.0.0", - "@nextcloud/browserslist-config": "^2.2.0", - "@nextcloud/eslint-config": "^8.0.0", - "@nextcloud/stylelint-config": "^2.1.2", - "@nextcloud/webpack-vue-config": "^5.2.1" + "@nextcloud/babel-config": "^1.2.0", + "@nextcloud/browserslist-config": "^3.0.1", + "@nextcloud/eslint-config": "^8.4.1", + "@nextcloud/stylelint-config": "^3.0.1", + "@nextcloud/webpack-vue-config": "^6.0.1" } -} +} \ No newline at end of file From 1547cfb9564c5533e43275c403f1e3e76798b7f8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 19 May 2024 22:04:50 +0000 Subject: [PATCH 11/12] Update nextcloud Docker tag to v28.0.5 --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 37ce9978..19393f1f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -2,7 +2,7 @@ version: '3' services: nextcloud-server: - image: nextcloud:28.0.4-fpm + image: nextcloud:28.0.5-fpm container_name: nextcloud-server hostname: nextcloud-server environment: From b359d4419aebfd40865a8b1d783cf4221d03cf66 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 19 May 2024 22:04:52 +0000 Subject: [PATCH 12/12] Update mariadb Docker tag to v10.11 --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 37ce9978..13714c7f 100644 --- a/compose.yaml +++ b/compose.yaml @@ -37,7 +37,7 @@ services: container_name: nextcloud-db hostname: nextcloud-db restart: unless-stopped - image: mariadb:10.8 + image: mariadb:10.11 ports: - "3306:3306" environment: