Skip to content

Commit

Permalink
Merge branch 'main' into hotfix/navigation-base-page-title
Browse files Browse the repository at this point in the history
  • Loading branch information
nas-tabchiche committed Dec 31, 2024
2 parents 4a3a2fb + 8cccab1 commit dff178c
Show file tree
Hide file tree
Showing 57 changed files with 1,982 additions and 448 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/backend-api-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ on:

env:
GITHUB_WORKFLOW: github_actions
PYTHON_VERSION: "3.12"
UBUNTU_VERSION: "ubuntu-24.04"

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
backend-directory: ./backend

strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v3
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/backend-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ on:

env:
GITHUB_WORKFLOW: github_actions
POSTGRES_VERSION: "16"
UBUNTU_VERSION: "ubuntu-24.04"
PYTHON_VERSION: "3.12"

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
backend-directory: ./backend

services:
postgres:
image: postgres:14.1
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres # test credential
Expand All @@ -28,7 +31,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/backend-linters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ on:

env:
GITHUB_WORKFLOW: github_actions
PYTHON_VERSION: "3.12"
UBUNTU_VERSION: "ubuntu-24.04"

jobs:
ruff:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
working-directory: ./backend

strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/backend-migrations-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ env:
backend-directory: ./backend
enterprise-backend-directory: ./enterprise/backend
enterprise-backend-settings-module: enterprise_core.settings
UBUNTU_VERSION: "ubuntu-24.04"
PYTHON_VERSION: "3.12"

jobs:
migrations-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -58,12 +60,12 @@ jobs:
poetry run python manage.py makemigrations --check --dry-run --verbosity=3
enterprise-migrations-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/docker-build-and-push-ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ on:
- "v*"
workflow_dispatch:

env:
UBUNTU_VERSION: "ubuntu-24.04"

jobs:
build-and-push:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/docker-build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ on:
- "v*"
workflow_dispatch:

env:
UBUNTU_VERSION: "ubuntu-24.04"

jobs:
build-and-push:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/frontend-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ on:

env:
GITHUB_WORKFLOW: github_actions
UBUNTU_VERSION: "ubuntu-24.04"
NODE_VERSION: "22"

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
working-directory: ./frontend

strategy:
max-parallel: 4
matrix:
node-version: ["20"]
node-version: ["22"]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/frontend-linters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ on:

env:
GITHUB_WORKFLOW: github_actions
UBUNTU_VERSION: "ubuntu-24.04"
NODE_VERSION: "22"

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
working-directory: ./frontend
PUBLIC_BACKEND_API_URL: "http://127.0.0.1:8000/api"

strategy:
max-parallel: 4
matrix:
node-version: ["20"]
node-version: ["22"]

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/frontend-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ on:

env:
GITHUB_WORKFLOW: github_actions
UBUNTU_VERSION: "ubuntu-24.04"
NODE_VERSION: "22"

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
working-directory: ./frontend

strategy:
max-parallel: 4
matrix:
node-version: ["20"]
node-version: ["22"]

steps:
- uses: actions/checkout@v3
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ env:
enterprise-frontend-build-directory: ./enterprise/frontend/.build/frontend
enterprise-backend-settings-module: enterprise_core.settings
DEBUG: pw:webserver
POSTGRES_VERSION: "16"
UBUNTU_VERSION: "ubuntu-24.04"
PYTHON_VERSION: "3.12"

jobs:
functional-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
image: postgres:14.1
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres # test credential
Expand All @@ -35,7 +38,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]
playwright-browser: ["chromium"]

steps:
Expand Down Expand Up @@ -124,11 +127,11 @@ jobs:
retention-days: 5

enterprise-functional-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
image: postgres:14.12
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand All @@ -142,7 +145,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]
playwright-browser: ["chromium"]

steps:
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/startup-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@ env:
enterprise-frontend-directory: ./enterprise/frontend
enterprise-frontend-build-directory: ./enterprise/frontend/.build/frontend
enterprise-backend-settings-module: enterprise_core.settings
POSTGRES_VERSION: "16"
UBUNTU_VERSION: "ubuntu-24.04"
PYTHON_VERSION: "3.12"

jobs:
startup-functional-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
image: postgres:14.12
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand All @@ -31,7 +34,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -110,7 +113,7 @@ jobs:
retention-days: 5

startup-docker-compose-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
COMPOSE_TEST: True
steps:
Expand Down Expand Up @@ -157,11 +160,11 @@ jobs:
fi
enterprise-startup-functional-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
image: postgres:14.12
image: postgres:16
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
Expand All @@ -172,7 +175,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: ["3.11"]
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -250,7 +253,7 @@ jobs:
retention-days: 5

enterprise-startup-docker-compose-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
COMPOSE_TEST: True
steps:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/version-change-check.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
name: Version change checker

on:
pull_request:
branches: [main]
types: [opened]

env:
UBUNTU_VERSION: "ubuntu-24.04"

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 0 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ RUN pip install --upgrade pip && \
RUN poetry install
RUN rm -rf $POETRY_CACHE_DIR

RUN addgroup -g 1001 -S app && adduser -u 1001 -S -G app app
USER app

ENTRYPOINT ["poetry", "run", "bash", "startup.sh"]
EXPOSE 8000
Loading

0 comments on commit dff178c

Please sign in to comment.