diff --git a/.github/workflows/Gitflow.yml b/.github/workflows/Gitflow.yml index 239cf976..7c41adfa 100644 --- a/.github/workflows/Gitflow.yml +++ b/.github/workflows/Gitflow.yml @@ -31,9 +31,20 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Install GitVersion + run: | + dotnet tool install --global GitVersion.Tool --version 5.* + export PATH="$PATH:/home/runner/.dotnet/tools" + + - name: Generate a version + id: gitversion + run: | + export GITVERSION_FULLSEMVER=$(gitversion /showvariable FullSemVer) + echo "GIT_TAG=${GITVERSION_FULLSEMVER}" >> $GITHUB_ENV + - name: Create release tag env: - GIT_TAG: "v$(date +'%Y.%m.%d.%H%M')" + GIT_TAG: ${{ env.GIT_TAG }} run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 1f1e4a47..6a7648c6 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -1,4 +1,3 @@ - name: Trunk CI on: @@ -32,9 +31,20 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Install GitVersion + run: | + dotnet tool install --global GitVersion.Tool --version 5.* + export PATH="$PATH:/home/runner/.dotnet/tools" + + - name: Generate a version + id: gitversion + run: | + export GITVERSION_FULLSEMVER=$(gitversion /showvariable FullSemVer) + echo "GIT_TAG=${GITVERSION_FULLSEMVER}" >> $GITHUB_ENV + - name: Create release tag env: - GIT_TAG: "v$(date +'%Y.%m.%d.%H%M')" + GIT_TAG: ${{ env.GIT_TAG }} run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" diff --git a/Videogames_project/__pycache__/settings.cpython-312.pyc b/Videogames_project/__pycache__/settings.cpython-312.pyc index 01f0ef43..f2e3e995 100644 Binary files a/Videogames_project/__pycache__/settings.cpython-312.pyc and b/Videogames_project/__pycache__/settings.cpython-312.pyc differ diff --git a/Videogames_project/settings.py b/Videogames_project/settings.py index 9a4e4a47..57a5f84b 100644 --- a/Videogames_project/settings.py +++ b/Videogames_project/settings.py @@ -12,6 +12,8 @@ import os from pathlib import Path + + from django.contrib import staticfiles import environ @@ -98,6 +100,7 @@ } } + # Password validation # https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators diff --git a/videogames_register/__pycache__/tests.cpython-312.pyc b/videogames_register/__pycache__/tests.cpython-312.pyc deleted file mode 100644 index 899dcb14..00000000 Binary files a/videogames_register/__pycache__/tests.cpython-312.pyc and /dev/null differ diff --git a/videogames_register/__pycache__/views.cpython-312.pyc b/videogames_register/__pycache__/views.cpython-312.pyc index 481c6529..bbb0988b 100644 Binary files a/videogames_register/__pycache__/views.cpython-312.pyc and b/videogames_register/__pycache__/views.cpython-312.pyc differ diff --git a/videogames_register/migrations/__pycache__/0001_initial.cpython-312.pyc b/videogames_register/migrations/__pycache__/0001_initial.cpython-312.pyc index a7673e3b..077d2b9b 100644 Binary files a/videogames_register/migrations/__pycache__/0001_initial.cpython-312.pyc and b/videogames_register/migrations/__pycache__/0001_initial.cpython-312.pyc differ diff --git a/videogames_register/templates/videogames_register/videogame_list.html b/videogames_register/templates/videogames_register/videogame_list.html index 39e67d84..72e68c3f 100644 --- a/videogames_register/templates/videogames_register/videogame_list.html +++ b/videogames_register/templates/videogames_register/videogame_list.html @@ -1,7 +1,7 @@ {% extends "videogames_register/base.html" %} {% block content %} -