Skip to content

Commit

Permalink
Merge branch 'main' into scanning-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
ata-no-one committed May 22, 2024
2 parents 172bad4 + 0f3c429 commit 043d94e
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 14 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Makefile CI

on:
push:
branches: [ "main" ]
tags: [ "*" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
name: setup node
with:
node-version: 20

- name: Build
run: make build

- name: Create artifact
run: make appstore

- name: Release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: build/artifacts/*
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions install
Original file line number Diff line number Diff line change
@@ -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
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
3 changes: 3 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
}

0 comments on commit 043d94e

Please sign in to comment.