From 0ecfdc129c326a2605edad1f64da1aa22a0ecf4c Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:25:38 +0100 Subject: [PATCH 01/22] added gitea cicd Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 17 +++++++++++++++++ requirements.txt | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 .gitea/workflows/migrate.yaml diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml new file mode 100644 index 0000000..18b2efd --- /dev/null +++ b/.gitea/workflows/migrate.yaml @@ -0,0 +1,17 @@ +name: Test Django + +jobs: + migrate: + name: SQLITE3 Migrations + runs-on: ubuntu:latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python 3.9 + uses: actions/setup-python@v2 + with: + python-version: 3.9 + - name: Install Dependencies + run: | + python3 -m pip install --upgrade pip + pip3 install -r requirements.txt + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5b1b146..c13ec06 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,12 @@ asgiref==3.7.2 +beautifulsoup4==4.12.2 Django==4.2.7 +django-bootstrap-v5==1.0.11 +django-browser-reload==1.12.1 +django-shortcuts==1.6 djangorestframework==3.14.0 +include==0.2.2 mysqlclient==2.2.0 pytz==2023.3.post1 +soupsieve==2.5 sqlparse==0.4.4 From f07e9c7bb4fb83cba0fce6e411e62629a9e8ad96 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:28:16 +0100 Subject: [PATCH 02/22] added cicd trigger Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 18b2efd..a843dab 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -1,5 +1,8 @@ name: Test Django +on: + push: + jobs: migrate: name: SQLITE3 Migrations From 418b25e45d7264222b3b748f172af012dc219c27 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:30:31 +0100 Subject: [PATCH 03/22] changed runs name Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index a843dab..2bd252f 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -1,12 +1,12 @@ name: Test Django +run-name: ${{ gitea.actor }} testing -on: - push: +on: [push] jobs: migrate: - name: SQLITE3 Migrations - runs-on: ubuntu:latest + name: Test migration + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - name: Set up Python 3.9 From 21ca2fd42917809e0047ae8c882be23fa54b67cb Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:32:56 +0100 Subject: [PATCH 04/22] changed python version for cicd Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 2bd252f..48cdb0a 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.9 + - name: Set up Python 3.11 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.11 - name: Install Dependencies run: | python3 -m pip install --upgrade pip From 10eb012f48a4a62f09b94c9d659d6436af0bf5e3 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:36:40 +0100 Subject: [PATCH 05/22] added token validation Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 48cdb0a..31016bb 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -9,6 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + with: + token: ${{ secrets.TOKEN}} - name: Set up Python 3.11 uses: actions/setup-python@v2 with: From 885ae191a3d4ed528037d648ea2f13d1cc406cb8 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:41:18 +0100 Subject: [PATCH 06/22] changed python installation Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 31016bb..7bb4d0b 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -12,7 +12,8 @@ jobs: with: token: ${{ secrets.TOKEN}} - name: Set up Python 3.11 - uses: actions/setup-python@v2 + run: | + apt install -yqq python3 python3-docs python3-pip with: python-version: 3.11 - name: Install Dependencies From d42f151e4dcfb16ead21a4dde9a44c3de870eae8 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:42:42 +0100 Subject: [PATCH 07/22] python install fix Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 7bb4d0b..dc156c7 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -14,8 +14,6 @@ jobs: - name: Set up Python 3.11 run: | apt install -yqq python3 python3-docs python3-pip - with: - python-version: 3.11 - name: Install Dependencies run: | python3 -m pip install --upgrade pip From a316f9149d1eeecd40f2e979dd1ee04ba9a11fba Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:44:07 +0100 Subject: [PATCH 08/22] fix Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index dc156c7..f9ab6b2 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -11,6 +11,7 @@ jobs: - uses: actions/checkout@v1 with: token: ${{ secrets.TOKEN}} + clean: false - name: Set up Python 3.11 run: | apt install -yqq python3 python3-docs python3-pip From 14e8eff8b8b121feb442177c47af38b9b4101160 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:45:57 +0100 Subject: [PATCH 09/22] fix Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index f9ab6b2..7fbe89a 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -10,8 +10,8 @@ jobs: steps: - uses: actions/checkout@v1 with: + submodules: true token: ${{ secrets.TOKEN}} - clean: false - name: Set up Python 3.11 run: | apt install -yqq python3 python3-docs python3-pip From f9f5dc6551852c015a167ae37f0833e0ab1a123e Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:46:37 +0100 Subject: [PATCH 10/22] fix Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 7fbe89a..332ff25 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -8,7 +8,7 @@ jobs: name: Test migration runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: submodules: true token: ${{ secrets.TOKEN}} From caa8311864dd9275c329666c52c640c0f2d42f32 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:48:44 +0100 Subject: [PATCH 11/22] removed submodule Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 332ff25..01a1e36 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -10,7 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - submodules: true token: ${{ secrets.TOKEN}} - name: Set up Python 3.11 run: | From 9bbb72d5a7c2fdd38bd05d1303e8a8d71ae16a4c Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:49:30 +0100 Subject: [PATCH 12/22] changed checkout cicd Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 01a1e36..7ad8c01 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -10,6 +10,7 @@ jobs: steps: - uses: actions/checkout@v3 with: + repository: jmehlich/quoteme token: ${{ secrets.TOKEN}} - name: Set up Python 3.11 run: | From e1672927d309520e590a4cb300608ba2dfdd2781 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Tue, 19 Dec 2023 19:54:44 +0100 Subject: [PATCH 13/22] changed repository Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 7ad8c01..34ff59e 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - repository: jmehlich/quoteme + repository: jmehlich/quoteMe token: ${{ secrets.TOKEN}} - name: Set up Python 3.11 run: | From 048273620a253391238e05ef4a08825d7c638d0d Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:02:52 +0100 Subject: [PATCH 14/22] reset cicd Signed-off-by: Jochen Mehlich --- .gitea/workflows/migrate.yaml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .gitea/workflows/migrate.yaml diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml deleted file mode 100644 index 34ff59e..0000000 --- a/.gitea/workflows/migrate.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: Test Django -run-name: ${{ gitea.actor }} testing - -on: [push] - -jobs: - migrate: - name: Test migration - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - repository: jmehlich/quoteMe - token: ${{ secrets.TOKEN}} - - name: Set up Python 3.11 - run: | - apt install -yqq python3 python3-docs python3-pip - - name: Install Dependencies - run: | - python3 -m pip install --upgrade pip - pip3 install -r requirements.txt - \ No newline at end of file From 1ea1ec486a2dd956ed6f48216b42f91527e17fa6 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:03:35 +0100 Subject: [PATCH 15/22] added new cicd Signed-off-by: Jochen Mehlich --- .gitea/workflows/test.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .gitea/workflows/test.yaml diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml new file mode 100644 index 0000000..aee0f29 --- /dev/null +++ b/.gitea/workflows/test.yaml @@ -0,0 +1,13 @@ +name: Test Django +run-name: ${{ gitea.actor }} testing + +on: [push] + +jobs: + migrate: + name: Test migration + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + token: ${{ secrets.TOKEN}} From 7178a7dc8f925296487de4dbb1b8513b217919dd Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:04:16 +0100 Subject: [PATCH 16/22] added labels --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index aee0f29..9ed8d24 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -11,3 +11,4 @@ jobs: - uses: actions/checkout@v3 with: token: ${{ secrets.TOKEN}} + name: Checkout Repository From cdbfd5db2acecaa8b8d7d7c452905de219ffc811 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:06:42 +0100 Subject: [PATCH 17/22] added ref for checkout --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 9ed8d24..5effee1 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -10,5 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 with: + ref: "main" token: ${{ secrets.TOKEN}} name: Checkout Repository From 1fc6cfc1d237e4b185a26be83575ed33b0dc3d65 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:10:05 +0100 Subject: [PATCH 18/22] test --- .gitea/workflows/test.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 5effee1..e0c9a8c 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -9,7 +9,3 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - ref: "main" - token: ${{ secrets.TOKEN}} - name: Checkout Repository From 4082cb90c006d8d7b55b80371c650149e2aba00f Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:11:38 +0100 Subject: [PATCH 19/22] added functions to cicd --- .gitea/workflows/test.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index e0c9a8c..38dcc87 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -8,4 +8,13 @@ jobs: name: Test migration runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 + - name: Set up Python 3.11 + run: | + apt install -yqq python3 python3-docs python3-pip + - name: Install Dependencies + run: | + python3 -m pip install --upgrade pip + pip3 install -r requirements.txt + \ No newline at end of file From d0802e577d6b15a346a520a7c8809492317cf4d4 Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:12:50 +0100 Subject: [PATCH 20/22] added apt update --- .gitea/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 38dcc87..8b792b7 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -12,6 +12,7 @@ jobs: uses: actions/checkout@v3 - name: Set up Python 3.11 run: | + apt update -y apt install -yqq python3 python3-docs python3-pip - name: Install Dependencies run: | From 9502d6361398834b04900384815e7ae85b143acb Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:14:27 +0100 Subject: [PATCH 21/22] added migration to cicd --- .gitea/workflows/test.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index 8b792b7..bb012af 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -18,4 +18,7 @@ jobs: run: | python3 -m pip install --upgrade pip pip3 install -r requirements.txt + - name: Run migration + run: | + python3 manage.py migrate \ No newline at end of file From 292ee77e47796da0713d001b4f7bbc99740fd54f Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Wed, 20 Dec 2023 18:15:38 +0100 Subject: [PATCH 22/22] removed python-docs package --- .gitea/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index bb012af..7d9109f 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -13,7 +13,7 @@ jobs: - name: Set up Python 3.11 run: | apt update -y - apt install -yqq python3 python3-docs python3-pip + apt install -yqq python3 python3-pip - name: Install Dependencies run: | python3 -m pip install --upgrade pip