Skip to content

Commit

Permalink
Fix yamllint violations (mostly whitespace).
Browse files Browse the repository at this point in the history
  • Loading branch information
Potherca committed Jan 3, 2022
1 parent 9142dc0 commit 5422e9b
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 35 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
# This workflow will do a clean install of node dependencies, build the source
# code and run tests across different versions of node
# For more information see:
# https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: CI

Expand All @@ -16,12 +18,12 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest]
os: [ ubuntu-latest ]

steps:
- uses: actions/checkout@v2
# Run the Solid test-suite
- name: Run the Solid test suite
shell: 'script -q -e -c "bash {0}"'
run: |
bash ./run-solid-test-suite.sh
- uses: actions/checkout@v2
# Run the Solid test-suite
- name: Run the Solid test suite
shell: 'script -q -e -c "bash {0}"'
run: |
bash ./run-solid-test-suite.sh
13 changes: 10 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
baseurl: /solid-nextcloud
description: A plugin to make Nextcloud compatible with Solid
description: A plugin to make Nextcloud compatible with Solid
repository: pdsinterop/solid-nextcloud
title: Solid Nextcloud
url: https://pdsinterop.org/
Expand Down Expand Up @@ -33,7 +33,7 @@ nav:
exclude:
- /
- /404.html
favicon_ico : /favicon.ico
favicon_ico: /favicon.ico
main_title:
link: '/'
recurse: true
Expand All @@ -42,7 +42,14 @@ nav:
aux_links:
"PDS Interop on GitHub":
- https://github.com/pdsinterop
footer_content: '<p xmlns:dct="http://purl.org/dc/terms/" property="dct:rights">Copyright © <span property="dct:dateCopyrighted">2020-2021</span> <span property="dct:publisher">PDS Interop</span>. Distributed under a <a rel="license" href="https://pdsinterop.org/license/">MIT license</a>.</p>'
footer_content: |
<p xmlns:dct="http://purl.org/dc/terms/" property="dct:rights">
Copyright ©
<span property="dct:dateCopyrighted">2020-2021</span>
<span property="dct:publisher">PDS Interop</span>.
Distributed under a
<a rel="license" href="https://pdsinterop.org/license/">MIT license</a>.
</p>
gh_edit_link: true
gh_edit_repository: https://github.com/pdsinterop/solid-nextcloud
logo: https://avatars3.githubusercontent.com/u/65920341
Expand Down
40 changes: 20 additions & 20 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
version: '3'

services:
pubsub:
build:
context: https://github.com/pdsinterop/php-solid-pubsub-server.git#main
ports:
- 8080:8080
expose:
- 8080
depends_on:
- nextcloud
nextcloud:
build:
context: ./
dockerfile: Dockerfile
expose:
- 443
ports:
- 443:443
version: '3'

services:
pubsub:
build:
context: https://github.com/pdsinterop/php-solid-pubsub-server.git#main
ports:
- 8080:8080
expose:
- 8080
depends_on:
- nextcloud
nextcloud:
build:
context: ./
dockerfile: Dockerfile
expose:
- 443
ports:
- 443:443
13 changes: 10 additions & 3 deletions solid/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,14 @@ before_script:
- if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"; fi
- cd nextcloud
- mkdir data
- ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
- |
./occ maintenance:install \
--admin-pass admin \
--admin-user admin \
--database $DB \
--database-name oc_autotest \
--database-pass='' \
--database-user oc_autotest
- ./occ app:enable solid
- php -S localhost:8080 &
- cd apps/solid
Expand All @@ -66,5 +73,5 @@ addons:
mariadb: '10.1'

services:
- postgresql
- mariadb
- postgresql
- mariadb

0 comments on commit 5422e9b

Please sign in to comment.