Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/cn-uat' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
petrjasek committed Dec 17, 2024
2 parents 9a129b3 + 233694c commit 444c5a3
Show file tree
Hide file tree
Showing 46 changed files with 7,404 additions and 407 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/client" # Location of package manifests
schedule:
interval: "weekly"
interval: "daily"
- package-ecosystem: "pip" # See documentation for possible values
directory: "/server" # Location of package manifests
schedule:
interval: "weekly"
interval: "daily"
29 changes: 22 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,36 @@ jobs:
server:
runs-on: ubuntu-latest

services:
redis:
image: redis:alpine
ports:
- "6379:6379"

mongo:
image: mongo:3.6
ports:
- "27017:27017"

elastic:
image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
ports:
- "9200:9200"
env:
discovery.type: single-node

defaults:
run:
working-directory: server

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'

- name: docker-compose
run: docker-compose -f ../.actions-docker-compose.yml up -d

- run: sudo apt-get update && sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl

- name: pip install
Expand All @@ -47,7 +62,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '14.x'

Expand Down
2 changes: 1 addition & 1 deletion client/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
package-lock=false
package-lock=true
Loading

0 comments on commit 444c5a3

Please sign in to comment.