Skip to content

Commit

Permalink
Merge branch 'main' into calendar_frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm authored Jul 22, 2023
2 parents 825de44 + ce2504e commit 8bfacc9
Show file tree
Hide file tree
Showing 45 changed files with 677 additions and 543 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:
GIT_COMMIT_SHA=${{ github.sha }}
GIT_COMMIT_MESSAGE=${{ github.event.head_commit.message }}
cache-from: type=gha
cache-to: type=gha,mode=max
cache-to: type=gha,mode=min
221 changes: 0 additions & 221 deletions .github/workflows/ci.yml

This file was deleted.

71 changes: 71 additions & 0 deletions .github/workflows/data-cicd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Data CI/CD

on:
pull_request:
branches: [main]
types: [opened, reopened, synchronize]
push:
branches: [main]
workflow_dispatch:

jobs:
data-test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r data/requirements.txt
- name: Test with unittest
run: |
python -m unittest discover
#type-check:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
#- name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v4
# with:
# python-version: "3.10"
# - name: Install dependencies
# run: |
# python -m pip install --upgrade pip
# pip install -r data/requirements.txt -r requirements_dev.txt -r server/main-api/test/requirements.txt
# - name: Run mypy
# run: |
# mypy --strict data
data-build:
needs:
- data-test
uses: ./.github/workflows/_docker-build.yml
with:
image_suffix: data
context: ./data
dockerfile: Dockerfile
permissions:
contents: read
packages: write
data-deployment-1:
uses: ./.github/workflows/_restart-argocd.yml
needs:
- data-build
with:
deployment: data
secrets:
ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
data-deployment-2: # we need to restart the server, as otherwise it will not serve the new data
uses: ./.github/workflows/_restart-argocd.yml
needs:
- data-deployment-1
with:
deployment: server
secrets:
ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
35 changes: 35 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Linting

on:
pull_request:
branches: [main]
types: [opened, reopened, synchronize]
push:
branches: [main]
workflow_dispatch:

jobs:
linting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
cache: 'npm'
cache-dependency-path: 'webclient/package.json'
- name: Install node dependencies
run: |
npm install -g openapi-format
npm install --prefix webclient
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
cache: 'pip'
cache-dependency-path: 'requirements*.txt'
- name: Install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r data/requirements.txt -r requirements_dev.txt -r server/main-api/test/requirements.txt
- name: Run pre-commit
uses: pre-commit/[email protected]
Loading

0 comments on commit 8bfacc9

Please sign in to comment.