Skip to content

Commit

Permalink
Merge branch 'develop' into fix-753-referredOutTest-react
Browse files Browse the repository at this point in the history
  • Loading branch information
mozzy11 authored Jun 20, 2024
2 parents ca17b51 + 750d49c commit 00980f7
Show file tree
Hide file tree
Showing 2,333 changed files with 231,985 additions and 207,989 deletions.
6 changes: 4 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Pull Requests Requirements

- [ ] The PR title includes a brief description of the work done, including the Issue number if applicable.
- [ ] The PR title includes a brief description of the work done, including the
Issue number if applicable.
- [ ] The PR includes a video showing the changes for the work done.
- [ ] The PR title follows conventional commit label standards.
- [ ] The changes confirm to the OpenElis Global x3 Styleguide and design documentation.
- [ ] The changes confirm to the OpenElis Global x3 Styleguide and design
documentation.
- [ ] The changes include tests or are validated by existing tests.
- [ ] I have read and agree to the Contributing Guidelines of this project.

Expand Down
71 changes: 36 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,42 @@
name: OpenELIS-Global-2 CI Build
name: OpenELIS-Global-2 CI Build
on:
push:
branches: [develop ,'develop_3x']
branches: [develop]
pull_request:
branches: [develop ,'develop_3x']
branches: [develop]
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Checkout OpenELIS-Global2
uses: actions/checkout@v2
with:
repository: ${{github.repository}}
submodules: recursive
- name: Initialize and build submodules
run: |
cd dataexport
mvn clean install
cd ..
- name: Build OpenELIS-Global2
run: mvn clean install

- name: Run OpenELS image
run : docker-compose -f build.docker-compose.yml up -d

checkFormat-build-unitTest-and-run:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Checkout OpenELIS-Global2
uses: actions/checkout@v2
with:
repository: ${{github.repository}}
submodules: recursive

- name: check formatting
run: mvn spotless:check

- name: Initialize and build submodules
run: |
cd dataexport
mvn clean install
cd ..
- name: Build OpenELIS-Global2
run: mvn clean install -Dspotless.check.skip=true

25 changes: 12 additions & 13 deletions .github/workflows/frontend-qa.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
name: OpenELis Frontend QA framework workflow
on:
push:
branches: [ 'develop_3x' ]
branches: [develop]
pull_request:
branches: ['develop_3x']
branches: [develop]
workflow_dispatch:
jobs:
install:
build-and-run-qa-tests:
runs-on: ubuntu-latest
steps:
- name: Checkout OpenELIS-Global2
uses: actions/checkout@v2
with:
repository: ${{github.repository}}

- name: Run OpenELS image
run : docker-compose -f build.docker-compose.yml up -d

- name: Sleep for 2 minutes
repository: ${{github.repository}}
submodules: recursive

- name: Run OpenELS image
run: docker-compose -f build.docker-compose.yml up -d

- name: Sleep for 2 minutes
run: sleep 2m
shell: bash
shell: bash

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x

- name: Install dependencies
run: npm install
working-directory: frontend
Expand All @@ -37,5 +38,3 @@ jobs:
- name: Run Frontend Qa Workflow
run: npx cypress run –headless
working-directory: frontend


4 changes: 2 additions & 2 deletions .github/workflows/label-merge-conflict.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ permissions:

on:
push:
branches: [develop_3x]
branches: [develop]
pull_request:
branches: [develop_3x]
branches: [develop]

jobs:
auto-label:
Expand Down
Loading

0 comments on commit 00980f7

Please sign in to comment.