Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e8e441d98
|
||
|
|
0e83de70e3
|
||
|
|
8169ef719a
|
||
|
|
7637499a97
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/backend",
|
"name": "@memegoat/backend",
|
||||||
"version": "1.0.6",
|
"version": "1.0.8",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/frontend",
|
"name": "@memegoat/frontend",
|
||||||
"version": "1.0.6",
|
"version": "1.0.8",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export default function AdminContentsPage() {
|
|||||||
<TableCell className="font-medium">
|
<TableCell className="font-medium">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="flex h-10 w-10 items-center justify-center rounded bg-muted">
|
<div className="flex h-10 w-10 items-center justify-center rounded bg-muted">
|
||||||
{content.type === "image" ? (
|
{content.type === "meme" ? (
|
||||||
<ImageIcon className="h-5 w-5 text-muted-foreground" />
|
<ImageIcon className="h-5 w-5 text-muted-foreground" />
|
||||||
) : (
|
) : (
|
||||||
<Video className="h-5 w-5 text-muted-foreground" />
|
<Video className="h-5 w-5 text-muted-foreground" />
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/source",
|
"name": "@memegoat/source",
|
||||||
"version": "1.0.6",
|
"version": "1.0.8",
|
||||||
"description": "",
|
"description": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"version:get": "cmake -P version.cmake GET",
|
"version:get": "cmake -P version.cmake GET",
|
||||||
|
|||||||
@@ -39,6 +39,42 @@ function(increment_version CURRENT_VERSION TYPE OUT_VAR)
|
|||||||
set(${OUT_VAR} "${MAJOR}.${MINOR}.${PATCH}" PARENT_SCOPE)
|
set(${OUT_VAR} "${MAJOR}.${MINOR}.${PATCH}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
# Fonction pour créer un commit git pour les changements de version
|
||||||
|
function(commit_version_changes VERSION)
|
||||||
|
find_package(Git QUIET)
|
||||||
|
if(GIT_FOUND)
|
||||||
|
# On n'ajoute que les fichiers package.json modifiés
|
||||||
|
set(ADDED_ANY FALSE)
|
||||||
|
foreach(JSON_FILE ${PACKAGE_JSON_FILES})
|
||||||
|
if(EXISTS "${JSON_FILE}")
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${GIT_EXECUTABLE} add "${JSON_FILE}"
|
||||||
|
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
|
||||||
|
)
|
||||||
|
set(ADDED_ANY TRUE)
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
if(ADDED_ANY)
|
||||||
|
# On commit uniquement les fichiers qui ont été ajoutés (staged)
|
||||||
|
# L'utilisation de --only ou spécifier les fichiers à nouveau assure qu'on ne prend pas d'autres changements
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${GIT_EXECUTABLE} commit -m "chore: bump version to ${VERSION}" -- ${PACKAGE_JSON_FILES}
|
||||||
|
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
|
||||||
|
RESULT_VARIABLE COMMIT_RESULT
|
||||||
|
)
|
||||||
|
|
||||||
|
if(COMMIT_RESULT EQUAL 0)
|
||||||
|
message(STATUS "Changements commités avec succès pour la version ${VERSION}")
|
||||||
|
else()
|
||||||
|
message(WARNING "Échec du commit des changements. Il n'y a peut-être rien à commiter ou aucun changement sur les fichiers JSON.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
message(WARNING "Git non trouvé, impossible de commiter les changements.")
|
||||||
|
endif()
|
||||||
|
endfunction()
|
||||||
|
|
||||||
# Fonction pour créer un tag git
|
# Fonction pour créer un tag git
|
||||||
function(create_git_tag VERSION)
|
function(create_git_tag VERSION)
|
||||||
find_package(Git QUIET)
|
find_package(Git QUIET)
|
||||||
@@ -73,6 +109,9 @@ function(set_new_version NEW_VERSION)
|
|||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
# Commiter les changements
|
||||||
|
commit_version_changes(${NEW_VERSION})
|
||||||
|
|
||||||
# Créer le tag git
|
# Créer le tag git
|
||||||
create_git_tag(${NEW_VERSION})
|
create_git_tag(${NEW_VERSION})
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
Reference in New Issue
Block a user