Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: molgenis/molgenis-service-armadillo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.2
Choose a base ref
...
head repository: molgenis/molgenis-service-armadillo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 12,173 additions and 4,057 deletions.
  1. +83 −28 .circleci/config.yml
  2. +16 −0 .github/ISSUE_TEMPLATE/bug_report.md
  3. +20 −0 .github/ISSUE_TEMPLATE/feature_request.md
  4. +6 −0 .github/pull_request_template.md
  5. +28 −0 .github/workflows/docs.yml
  6. +14 −0 .github/workflows/main.yml
  7. +7 −0 .gitignore
  8. +2 −155 CONTRIBUTING.md
  9. +2 −2 Dockerfile
  10. +22 −5 README.md
  11. +2 −2 application.template.yml
  12. +25 −21 armadillo/build.gradle
  13. +1 −1 armadillo/src/main/java/org/molgenis/armadillo/README.md
  14. +8 −25 armadillo/src/main/java/org/molgenis/armadillo/audit/AuditEventPublisher.java
  15. +1 −1 armadillo/src/main/java/org/molgenis/armadillo/audit/AuthenticationAuditListener.java
  16. +71 −7 armadillo/src/main/java/org/molgenis/armadillo/controller/DataController.java
  17. +15 −10 armadillo/src/main/java/org/molgenis/armadillo/controller/InsightController.java
  18. +19 −0 armadillo/src/main/java/org/molgenis/armadillo/controller/StorageController.java
  19. +17 −0 armadillo/src/main/java/org/molgenis/armadillo/exceptions/InvalidObjectNameException.java
  20. +45 −0 armadillo/src/main/java/org/molgenis/armadillo/info/FileMetrics.java
  21. +2 −2 armadillo/src/main/java/org/molgenis/armadillo/info/RMetrics.java
  22. +3 −1 armadillo/src/main/java/org/molgenis/armadillo/info/RProcessEndpoint.java
  23. +33 −0 armadillo/src/main/java/org/molgenis/armadillo/info/UserInformationRetriever.java
  24. +18 −2 armadillo/src/main/java/org/molgenis/armadillo/metadata/FileDetails.java
  25. +106 −29 armadillo/src/main/java/org/molgenis/armadillo/metadata/InsightService.java
  26. +1 −0 armadillo/src/main/java/org/molgenis/armadillo/metadata/ProfileConfig.java
  27. +63 −0 armadillo/src/main/java/org/molgenis/armadillo/metadata/TextBlockReader.java
  28. +11 −6 armadillo/src/main/java/org/molgenis/armadillo/profile/DockerService.java
  29. +1 −0 armadillo/src/main/java/org/molgenis/armadillo/profile/ProfileScope.java
  30. +2 −0 armadillo/src/main/java/org/molgenis/armadillo/security/AuthConfig.java
  31. +111 −2 armadillo/src/main/java/org/molgenis/armadillo/service/FileService.java
  32. +26 −1 armadillo/src/main/java/org/molgenis/armadillo/storage/ArmadilloLinkFile.java
  33. +123 −23 armadillo/src/main/java/org/molgenis/armadillo/storage/ArmadilloStorageService.java
  34. +34 −0 armadillo/src/main/java/org/molgenis/armadillo/storage/ArmadilloWorkspace.java
  35. +27 −2 armadillo/src/main/java/org/molgenis/armadillo/storage/FileInfo.java
  36. +94 −8 armadillo/src/main/java/org/molgenis/armadillo/storage/LocalStorageService.java
  37. +60 −30 armadillo/src/main/java/org/molgenis/armadillo/storage/ParquetUtils.java
  38. +35 −1 armadillo/src/main/java/org/molgenis/armadillo/storage/StorageService.java
  39. +1 −1 armadillo/src/main/resources/application.yml
  40. +2 −10 armadillo/src/test/java/org/molgenis/armadillo/controller/ArmadilloUtilsTest.java
  41. +72 −8 armadillo/src/test/java/org/molgenis/armadillo/controller/DataControllerTest.java
  42. +21 −1 armadillo/src/test/java/org/molgenis/armadillo/controller/StorageControllerTest.java
  43. +23 −17 .../molgenis/armadillo/{audit/AuditEventPublisherTest.java → info/UserInformationRetrieverTest.java}
  44. +47 −0 armadillo/src/test/java/org/molgenis/armadillo/metadata/ProfileConfigTest.java
  45. +19 −5 armadillo/src/test/java/org/molgenis/armadillo/{config → profile}/DockerServiceTest.java
  46. +60 −14 armadillo/src/test/java/org/molgenis/armadillo/storage/ArmadilloLinkFileTest.java
  47. +312 −18 armadillo/src/test/java/org/molgenis/armadillo/storage/ArmadilloStorageServiceTest.java
  48. +42 −0 armadillo/src/test/java/org/molgenis/armadillo/storage/ArmadilloWorkspaceTest.java
  49. +103 −4 armadillo/src/test/java/org/molgenis/armadillo/storage/LocalStorageServiceTest.java
  50. +28 −5 armadillo/src/test/java/org/molgenis/armadillo/storage/ParquetUtilsTest.java
  51. +16 −5 build.gradle
  52. +39 −0 ci/create_or_update_k8s-azure.sh
  53. +9 −0 ci/set_kubectl_config-azure.sh
  54. BIN data/shared-lifecycle/survival/veteran.parquet
  55. +2 −0 docker/bin/prepare.bash
  56. +2 −2 docker/ci/Dockerfile
  57. +31 −25 docker/ci/README.md
  58. +17 −4 docker/ci/application.yml
  59. +2 −2 docker/ci/armadillo-compose.md
  60. +1 −1 docker/ci/ci.env
  61. +4 −16 docker/ci/docker-compose.yml
  62. 0 docs/.nojekyll
  63. +0 −19 docs/DataSHIELD-datamanagement/0_Prerequisite.r
  64. +0 −119 docs/DataSHIELD-datamanagement/1_MolgenisArmadillo.r
  65. +0 −96 docs/DataSHIELD-datamanagement/2_Creating_data_subsets_Armadillo.r
  66. +0 −39 docs/DataSHIELD-datamanagement/3_Analyse_data_subset_DSMolgenisArmadillo.r
  67. +0 −13 docs/README.md
  68. +0 −8 docs/_coverpage.md
  69. +0 −21 docs/_navbar.md
  70. +0 −15 docs/_sidebar.md
  71. +0 −19 docs/adr/0001-use-adr-to-describe-architecture-decisions.md
  72. +0 −27 docs/adr/0002-implement-authentication-using-openid.md
  73. +0 −21 docs/adr/0003-implement-method-security-using-datashield4j.md
  74. +0 −20 docs/adr/0004-implement-asynchronicity-in-requestflow.md
  75. +0 −21 docs/adr/0005-deploy-on-both-vm-and-kubernetes.md
  76. +0 −23 docs/adr/0006-use-rdata-format-as-data-input.md
  77. +0 −39 docs/adr/0007-use-roles-to-authorise-users-to-use-data.md
  78. +0 −18 docs/adr/0008-load-multiple-rdata-files.md
  79. +0 −25 docs/adr/0009-use-bean-scope-for-profiles.md
  80. +269 −0 docs/css/simple.css
  81. BIN docs/{DataSHIELD-datamanagement → }/data/nonrep.parquet
  82. BIN docs/{DataSHIELD-datamanagement → }/data/yearlyrep.parquet
  83. +0 −36 docs/developer_notes.md
  84. +0 −105 docs/faq.md
  85. BIN docs/img/armadillo-logo-border.png
  86. BIN docs/img/ds-complete-setup.png
  87. BIN docs/img/ds-simple-setup.png
  88. BIN docs/img/favicon.ico
  89. BIN docs/img/overview-datashield.png
  90. BIN docs/img/project-file-structure.png
  91. BIN docs/img/swagger.png
  92. BIN docs/img/ui-non-admin-message.png
  93. BIN docs/img/ui-projects.png
  94. +0 −45 docs/index.html
  95. +13 −0 docs/index.md
  96. +0 −28 docs/ops/configuring.md
  97. +0 −38 docs/ops/install/install_apache.md
  98. +0 −10 docs/ops/install/install_docker.md
  99. +0 −13 docs/ops/install/install_java.md
  100. +13 −0 docs/overrides/partials/copyright.html
  101. +7 −0 docs/pages/about_us.md
  102. +6 −0 docs/pages/advanced_usage.md
  103. +42 −0 docs/pages/basic_concepts.md
  104. +172 −0 docs/pages/basic_usage/armadillo_ui.md
  105. +5 −0 docs/pages/basic_usage/auth.md
  106. +7 −0 docs/pages/basic_usage/central_analysis_server.md
  107. +70 −0 docs/pages/basic_usage/ds_molgenis_armadillo.md
  108. +10 −0 docs/pages/basic_usage/dslite.md
  109. +10 −0 docs/pages/basic_usage/dsupload_dsdictionaries.md
  110. +22 −0 docs/pages/basic_usage/index.md
  111. +252 −0 docs/pages/basic_usage/molgenis_armadillo.md
  112. +3 −0 docs/pages/contact.md
  113. +176 −0 docs/pages/dev_guides.md
  114. +6 −0 docs/pages/examples_usage.md
  115. +95 −0 docs/pages/faq.md
  116. +74 −32 docs/{ops/installing.md → pages/install_management/armadillo_install.md}
  117. +19 −0 docs/pages/install_management/armadillo_management.md
  118. +110 −79 docs/{upgrade-3-4.md → pages/install_management/armadillo_migrate_2_to_3.md}
  119. +125 −68 docs/{upgrade-2-3.md → pages/install_management/armadillo_migrate_3_to_4.md}
  120. +140 −0 docs/pages/install_management/armadillo_minor_release_update.md
  121. +8 −0 docs/pages/install_management/index.md
  122. +3 −0 docs/pages/license.md
  123. +128 −0 docs/pages/quick_start.md
  124. +1 −0 docs/pages/troubleshooting.md
  125. +0 −41 docs/release-test.md
  126. +0 −229 docs/ui.md
  127. +1 −1 gradle/wrapper/gradle-wrapper.properties
  128. +23 −0 helm-chart/.helmignore
  129. +6 −0 helm-chart/Chart.yaml
  130. +22 −0 helm-chart/templates/NOTES.txt
  131. +62 −0 helm-chart/templates/_helpers.tpl
  132. +92 −0 helm-chart/templates/deployment.yaml
  133. +28 −0 helm-chart/templates/hpa.yaml
  134. +61 −0 helm-chart/templates/ingress.yaml
  135. +16 −0 helm-chart/templates/pvc.yaml
  136. +15 −0 helm-chart/templates/service.yaml
  137. +12 −0 helm-chart/templates/serviceaccount.yaml
  138. +15 −0 helm-chart/templates/tests/test-connection.yaml
  139. +145 −0 helm-chart/values.yaml
  140. +89 −0 mkdocs.yml
  141. +19 −15 r/build.gradle
  142. +38 −19 r/src/main/java/org/molgenis/r/RServerConnectionFactory.java
  143. +9 −0 r/src/main/java/org/molgenis/r/config/EnvironmentConfigProps.java
  144. +101 −71 r/src/main/java/org/molgenis/r/rock/RockConnection.java
  145. +102 −0 r/src/main/java/org/molgenis/r/rserve/RserveConnection.java
  146. +57 −0 r/src/main/java/org/molgenis/r/rserve/RserveConnectionFactory.java
  147. +15 −0 r/src/main/java/org/molgenis/r/rserve/RserveException.java
  148. +124 −0 r/src/main/java/org/molgenis/r/rserve/RserveNamedList.java
  149. +173 −0 r/src/main/java/org/molgenis/r/rserve/RserveResult.java
  150. +153 −0 r/src/test/java/org/molgenis/r/RserveNamedListTest.java
  151. +91 −0 r/src/test/java/org/molgenis/r/RserverConnectionFactoryTest.java
  152. +33 −0 r/src/test/java/org/molgenis/r/config/EnvironmentConfigPropsTest.java
  153. +38 −0 r/src/test/java/org/molgenis/r/rserve/RserveConnectionFactoryTest.java
  154. +119 −0 r/src/test/java/org/molgenis/r/rserve/RserveConnectionTest.java
  155. +195 −0 r/src/test/java/org/molgenis/r/rserve/RserveResultTest.java
  156. +4 −12 r/src/test/java/org/molgenis/r/service/ProcessServiceImplTest.java
  157. +4 −5 r/src/test/java/org/molgenis/r/service/RExecutorServiceImplTest.java
  158. +2 −2 scripts/install/README.md
  159. +2 −2 scripts/install/armadillo-setup.sh
  160. +5 −0 scripts/release/.gitignore
  161. +11 −6 scripts/release/README.md
  162. +4 −0 scripts/release/dev.env.dist
  163. +21 −9 scripts/release/install_release_script_dependencies.R
  164. +275 −0 scripts/release/lib/common-functions.R
  165. +22 −0 scripts/release/lib/release-test-info.R
  166. +111 −963 scripts/release/release-test.R
  167. +30 −0 scripts/release/test-cases/assigning.R
  168. +32 −0 scripts/release/test-cases/basic-auth.R
  169. +19 −0 scripts/release/test-cases/create-resource.R
  170. +12 −0 scripts/release/test-cases/create-test-project.R
  171. +14 −0 scripts/release/test-cases/dm-login.R
  172. +306 −0 scripts/release/test-cases/donkey-tidyverse.R
  173. +17 −0 scripts/release/test-cases/download-resources.R
  174. +53 −0 scripts/release/test-cases/download-tables.R
  175. +51 −0 scripts/release/test-cases/ds-base.R
  176. +28 −0 scripts/release/test-cases/manual-test.R
  177. +33 −0 scripts/release/test-cases/remove-data.R
  178. +43 −0 scripts/release/test-cases/researcher-login.R
  179. +19 −0 scripts/release/test-cases/set-admin-mode.R
  180. +22 −0 scripts/release/test-cases/set_researcher_access.R
  181. +134 −0 scripts/release/test-cases/setup-profiles.R
  182. +169 −0 scripts/release/test-cases/test-config.R
  183. +60 −0 scripts/release/test-cases/upload-data.R
  184. +44 −0 scripts/release/test-cases/upload-resource.R
  185. +69 −0 scripts/release/test-cases/verify-profile.R
  186. +56 −0 scripts/release/test-cases/verify-resources.R
  187. +212 −0 scripts/release/test-cases/xenon-exposome.R
  188. +106 −0 scripts/release/test-cases/xenon-mediate.R
  189. +54 −0 scripts/release/test-cases/xenon-mtl.R
  190. +79 −0 scripts/release/test-cases/xenon-omics.R
  191. +105 −0 scripts/release/test-cases/xenon-survival.R
  192. +1 −1 scripts/upgrade/Pipfile
  193. +58 −58 scripts/upgrade/Pipfile.lock
  194. +10 −10 scripts/upgrade/requirements.txt
  195. +4 −0 ui/.gitignore
  196. +12 −4 ui/README.md
  197. +2 −2 ui/build.gradle
  198. +11 −10 ui/package.json
  199. +0 −1 ui/public/_docs/master
  200. +6 −5 ui/shims-vue.d.ts
  201. +78 −16 ui/src/App.vue
  202. +148 −9 ui/src/api/api.ts
  203. +175 −0 ui/src/components/Actuator.vue
  204. +44 −0 ui/src/components/ActuatorItem.vue
  205. +5 −0 ui/src/components/Alert.vue
  206. +42 −0 ui/src/components/ColumnNamesPreview.vue
  207. +6 −1 ui/src/components/ConfirmationDialog.vue
  208. +163 −0 ui/src/components/DataPreviewTable.vue
  209. +33 −0 ui/src/components/Dropdown.vue
  210. +148 −0 ui/src/components/FileExplorer.vue
  211. +47 −0 ui/src/components/FolderInput.vue
  212. +48 −0 ui/src/components/FormValidation.vue
  213. +2 −0 ui/src/components/ListGroup.vue
  214. +160 −127 ui/src/components/RemoteFile.vue
  215. +0 −119 ui/src/components/SimpleTable.vue
  216. +101 −0 ui/src/components/VariableSelector.vue
  217. +392 −0 ui/src/components/ViewEditor.vue
  218. +22 −0 ui/src/helpers/insight.ts
  219. +164 −5 ui/src/helpers/utils.ts
  220. +6 −0 ui/src/router.ts
  221. +54 −1 ui/src/types/api.d.ts
  222. +40 −5 ui/src/types/types.d.ts
  223. +28 −10 ui/src/views/Insight.vue
  224. +348 −193 ui/src/views/ProjectsExplorer.vue
  225. +1 −0 ui/src/views/Users.vue
  226. +363 −0 ui/src/views/Workspaces.vue
  227. +23 −0 ui/tests/unit/components/ColumnNamesPreview.spec.ts
  228. +15 −15 ui/tests/unit/components/{SimpleTable.spec.ts → DataPreviewTable.spec.ts}
  229. +134 −0 ui/tests/unit/components/FileExplorer.spec.ts
  230. +31 −0 ui/tests/unit/components/FormValidation.spec.ts
  231. +44 −35 ui/tests/unit/components/RemoteFile.spec.ts
  232. +31 −0 ui/tests/unit/components/VariableSelector.spec.ts
  233. +156 −0 ui/tests/unit/components/ViewEditor.spec.ts
  234. +46 −3 ui/tests/unit/helpers/insight.spec.ts
  235. +243 −1 ui/tests/unit/helpers/utils.spec.ts
  236. +71 −51 ui/tests/unit/views/ProjectExplorer.spec.ts
  237. +148 −0 ui/tests/unit/views/Workspaces.spec.ts
  238. +28 −0 ui/vite.config.js
  239. +606 −501 ui/yarn.lock
111 changes: 83 additions & 28 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -6,10 +6,40 @@
#
version: 2.1

parameters:
GHA_Actor:
type: string
default: ""
GHA_Event:
type: string
default: ""
GHA_Action:
type: string
default: ""
GHA_Meta:
type: string
default: ""

orbs:
slack: circleci/slack@4.4.4

definitions:
build_config: &build_config
docker:
- image: molgenis/ci-build:1.2.3
working_directory: ~/repo
resource_class: large
environment:
JVM_OPTS: -Xmx3200m
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
TERM: dumb



jobs:
build:
docker:
- image: eclipse-temurin:17.0.9_9-jdk-jammy
- image: molgenis/ci-build:1.2.3

working_directory: ~/repo
resource_class: large
@@ -38,30 +68,6 @@ jobs:
pwd
echo "$CIRCLE_WORKING_DIRECTORY"
- run:
name: update package manager
command: apt-get update

- run:
name: add packages for docker cli install
command: apt-get -y install gnupg lsb-release curl

- run:
name: update packages again
command: apt-get update

- run:
name: set repo keys for docker packages
command: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg

- run:
name: add repo for docker packages
command: echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null

- run:
name: update package manager again
command: apt-get update

- run:
name: Install Docker client
command: apt-get -y install docker-ce docker-ce-cli containerd.io
@@ -71,7 +77,7 @@ jobs:
command: apt-get --yes install zip

- setup_remote_docker:
version: 19.03.13
version: previous
docker_layer_caching: true

- run:
@@ -89,7 +95,7 @@ jobs:
- run:
name: Build Armadillo and R CICD image
command: |
./gradlew docker
./gradlew docker ci
./docker/bin/prepare.bash ci
- store_artifacts:
@@ -127,11 +133,27 @@ jobs:
test \
jacocoMergedReport \
sonar \
--no-daemon \
-Dsonar.login=${SONAR_TOKEN} -Dsonar.organization=molgenis -Dsonar.host.url=https://sonarcloud.io -Dsonar.verbose=true \
-Dorg.ajoberstar.grgit.auth.username=${GITHUB_TOKEN} -Dorg.ajoberstar.grgit.auth.password \
-Dsonar.pullrequest.key=${CIRCLE_PULL_REQUEST##*/} -Dsonar.pullrequest.branch=${CIRCLE_BRANCH} \
dockerPush
fi
- run:
name: deploy preview to Azure
command: |
if [ "${CIRCLE_BRANCH}" != "master" ]; then
export $( cat build/ci.properties | xargs )
bash ci/set_kubectl_config-azure.sh
bash ci/create_or_update_k8s-azure.sh "preview-armadillo-pr-${CIRCLE_PULL_REQUEST##*/}" ${TAG_NAME} DELETE
curl -d "token=${SLACK_TOKEN}" \
-d "text=*<${CIRCLE_PULL_REQUEST}|Circle-CI » Armadillo » Armadillo-Service » PR-${CIRCLE_PULL_REQUEST##*/} #${CIRCLE_BUILD_NUM}>*
PR Preview available on https://preview-armadillo-pr-${CIRCLE_PULL_REQUEST##*/}.dev.molgenis.org" \
-d "channel=C0639V5KTCY" \
-X POST https://slack.com/api/chat.postMessage
fi
- run:
name: Make sure all images declared in docker-compose.yml are available and ready
command: |
@@ -195,8 +217,41 @@ jobs:
docker images ls
docker compose rm
delete-helm-preview:
environment:
GHA_PREVIEW_NR: << pipeline.parameters.GHA_Meta >>

docker:
- image: molgenis/ci-build:1.2.3

working_directory: ~/repo
resource_class: large

steps:
- checkout
- run:
name: delete preview on azure
command: |
export $( cat build/ci.properties | xargs )
bash ci/set_kubectl_config-azure.sh
kubectl delete namespace preview-emx2-pr-${GHA_PREVIEW_NR} || true
workflows:
version: 2
build-deploy:
unless:
equal: ["delete-pr-preview", << pipeline.parameters.GHA_Action >>]
jobs:
- build:
filters:
branches:
ignore: master

delete_preview:
when:
equal: [ "delete-pr-preview", << pipeline.parameters.GHA_Action >> ]
jobs:
- build
- delete-helm-preview



16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: "bug \U0001F41B, triage"
assignees: ''

---

### How to Reproduce


### Expected behavior


### Observed behavior
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
how to test:
- explain here what to do to test this (or point to unit tests)

todo:
- [ ] updated docs in case of new feature
- [ ] added tests
28 changes: 28 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: ci
on:
push:
branches:
- master
permissions:
contents: write
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Configure Git Credentials
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
- uses: actions/setup-python@v5
with:
python-version: 3.x
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
- uses: actions/cache@v4
with:
key: mkdocs-material-${{ env.cache_id }}
path: .cache
restore-keys: |
mkdocs-material-
- run: pip install mkdocs-material
- run: mkdocs gh-deploy --force
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
on:
pull_request:
types: [ closed ]
jobs:
trigger-circleci:
runs-on: ubuntu-latest
steps:
- name: Trigger CircleCI delete_preview workflow
id: "delete-pr-preview"
uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.2.0
with:
GHA_Meta: ${{ github.event.number }}
env:
CCI_TOKEN: ${{ secrets.CCI_PREV_TOKEN }}
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ dist
data/user-*
data/system

# Ignore all projects but life-cycle
data/shared-*
!data/shared-lifecycle
data/testing

HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
@@ -33,6 +38,7 @@ target/
*.iml
*.ipr


### NetBeans ###
/nbproject/private/
/nbbuild/
@@ -52,3 +58,4 @@ build/
/application.yaml
/application.properties
.Rproj.user
site/
Loading