diff --git a/.husky/pre-commit b/.husky/pre-commit index 9df0546ba..2a1952310 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ -!/usr/bin/env sh - . "$(dirname -- "$0")/_/husky.sh" +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" -npm run build:version && git add version/git-version.ts +node version/git-version.js diff --git a/version/git-version.js b/version/git-version.js index 0da9d8911..1a03ce9c0 100644 --- a/version/git-version.js +++ b/version/git-version.js @@ -10,7 +10,7 @@ const authorName = childProcess.execSync("git log -1 --pretty=format:'%an'").toS const commitTime = childProcess.execSync("git log -1 --pretty=format:'%cd'").toString().trim(); const commitMsg = childProcess.execSync("git log -1 --pretty=%B").toString().trim(); const totalCommitCount = childProcess.execSync("git rev-list --count HEAD").toString().trim(); -const change = childProcess.execSync(`git diff -- ":!/version/git-version.ts" ":!/version/git-version.json" `,{cwd: rootDir }).toString().trim(); +// const change = childProcess.execSync(`git diff -- ":!/version/git-version.ts" ":!/version/git-version.json" `,{cwd: rootDir }).toString().trim(); const changeStatus = childProcess.execSync("git status").toString().trim(); const changeAuthor = childProcess.execSync("whoami").toString().trim(); @@ -22,7 +22,6 @@ const versionInfo = { lastCommitTime: commitTime, lastCommitMessage: commitMsg, lastCommitNumber: totalCommitCount, - change, changeStatus, changeAuthor, } @@ -30,4 +29,4 @@ const versionInfo = { const versionInfoJson = JSON.stringify(versionInfo, null, 2); //console.log("versionInfo", versionInfo.diff) writeFileSync('./version/git-version.ts', "export let versionData = "+versionInfoJson); -// writeFileSync('./version/git-version.json', versionInfoJson); \ No newline at end of file +// writeFileSync('./version/git-version.json', versionInfoJson); diff --git a/version/git-version.ts b/version/git-version.ts index 7fbe8e44c..31ed2cd28 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "680f57366", - "SHA": "680f57313f4d97d944e96c6e3457b7f1a9f379f0", - "branch": "notification-header/feature", + "shortSHA": "3b6da3d2c", + "SHA": "3b6da3d2c785fea9e8e15de78f983f40d4763da3", + "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'", - "lastCommitMessage": "add attachments", - "lastCommitNumber": "1f516", - "change": "", - "changeStatus": "On branch notification-header/feature\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tnew file: src/app/store/notification-holder.service.spec.ts\n\tnew file: src/app/store/notification-holder.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html", + "lastCommitTime": "'Fri Jun 21 13:45:06 2024 +0100'", + "lastCommitMessage": "allow to alter agenda", + "lastCommitNumber": "5831", + "change": "diff --git a/.husky/pre-commit b/.husky/pre-commit\nindex 9df0546ba..2a1952310 100644\n--- a/.husky/pre-commit\n+++ b/.husky/pre-commit\n@@ -1,4 +1,4 @@\n-!/usr/bin/env sh\n- . \"$(dirname -- \"$0\")/_/husky.sh\"\n+#!/usr/bin/env sh\n+. \"$(dirname -- \"$0\")/_/husky.sh\"\n \n-npm run build:version && git add version/git-version.ts\n+node version/git-version.js", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .husky/commit-msg\n\tmodified: .husky/pre-commit\n\tnew file: gabinete.postman_collection.json\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/interceptors/metter.interceptor.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: .husky/pre-commit\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" -} +} \ No newline at end of file