Skip to content

Commit 77dbca5

Browse files
authored
Merge pull request #5 from Marrrco7/develop
Add changed workflow files to main branch
2 parents e7fd767 + 3b4c3ae commit 77dbca5

File tree

8 files changed

+28
-4
lines changed

8 files changed

+28
-4
lines changed

.github/workflows/Gitflow.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,20 @@ jobs:
3131
- name: Checkout code
3232
uses: actions/checkout@v4
3333

34+
- name: Install GitVersion
35+
run: |
36+
dotnet tool install --global GitVersion.Tool --version 5.*
37+
export PATH="$PATH:/home/runner/.dotnet/tools"
38+
39+
- name: Generate a version
40+
id: gitversion
41+
run: |
42+
export GITVERSION_FULLSEMVER=$(gitversion /showvariable FullSemVer)
43+
echo "GIT_TAG=${GITVERSION_FULLSEMVER}" >> $GITHUB_ENV
44+
3445
- name: Create release tag
3546
env:
36-
GIT_TAG: "v$(date +'%Y.%m.%d.%H%M')"
47+
GIT_TAG: ${{ env.GIT_TAG }}
3748
run: |
3849
git config user.name "github-actions[bot]"
3950
git config user.email "github-actions[bot]@users.noreply.github.com"

.github/workflows/trunk.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Trunk CI
32

43
on:
@@ -32,9 +31,20 @@ jobs:
3231
- name: Checkout code
3332
uses: actions/checkout@v4
3433

34+
- name: Install GitVersion
35+
run: |
36+
dotnet tool install --global GitVersion.Tool --version 5.*
37+
export PATH="$PATH:/home/runner/.dotnet/tools"
38+
39+
- name: Generate a version
40+
id: gitversion
41+
run: |
42+
export GITVERSION_FULLSEMVER=$(gitversion /showvariable FullSemVer)
43+
echo "GIT_TAG=${GITVERSION_FULLSEMVER}" >> $GITHUB_ENV
44+
3545
- name: Create release tag
3646
env:
37-
GIT_TAG: "v$(date +'%Y.%m.%d.%H%M')"
47+
GIT_TAG: ${{ env.GIT_TAG }}
3848
run: |
3949
git config user.name "github-actions[bot]"
4050
git config user.email "github-actions[bot]@users.noreply.github.com"
Binary file not shown.

Videogames_project/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import os
1313
from pathlib import Path
1414

15+
16+
1517
from django.contrib import staticfiles
1618
import environ
1719

@@ -98,6 +100,7 @@
98100
}
99101
}
100102

103+
101104
# Password validation
102105
# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
103106

Binary file not shown.
Binary file not shown.
Binary file not shown.

videogames_register/templates/videogames_register/videogame_list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "videogames_register/base.html" %}
22

33
{% block content %}
4-
<div class="search-bar">
4+
<div class="search-bar" style = "background-color: #ba2121">
55
<form method="get" action="{% url 'videogame_list' %}">
66
<input type="text" name="query" placeholder="Search games..." class="form-control" value="{{ request.GET.query }}">
77
<button type="submit" class="btn btn-primary mt-2">Search</button>

0 commit comments

Comments
 (0)