peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build version

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-22 15:24:48 +01:00
parent 8a176e684f
commit 27ad665977
8 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
git-version.json
+10
View File
@@ -0,0 +1,10 @@
{
"shortSHA": "8a176e684",
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4564",
"diff": "diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f87892e88 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -442,6 +442,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file"
}
package.json
+2 -1
View File
@@ -12,7 +12,8 @@
"test": "jest --detectOpenHandles --runInBand",
"test:prof": "ionic build --configuration production && npm run test",
"dev:share": "lite-server --baseDir=share",
"install:chromium": "node node_modules/puppeteer/install.js"
"install:chromium": "node node_modules/puppeteer/install.js",
"build:version":"node ./version/git-version.js"
},
"private": true,
"dependencies": {
src/app/app.component.ts
+4
View File
@@ -15,6 +15,7 @@ import { MessageModel } from './models/beast-orm';
import { InativityService } from "src/app/services/inativity.service";
import { ThemeService } from 'src/app/services/theme.service';
import { environment } from 'src/environments/environment';
import { Storage } from '@ionic/storage';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
parse: {
@@ -48,10 +49,13 @@ export class AppComponent {
private storageservice: StorageService,
private InativityService: InativityService,
public ThemeService: ThemeService,
private storage: Storage,
) {
// this.createCacheFolder()
this.initializeApp();
console.log('version: '+ environment.version)
this.storage.set('version', environment.version).then(() => {})
}
// async createCacheFolder(){
src/environments/environment.prod.ts
+3 -2
View File
@@ -1,3 +1,4 @@
import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
@@ -11,10 +12,10 @@ export const environment = {
// apiChatUrl: 'https://www.tabularium.pt/api/v1/',
production: true,
domain: 'gabinetedigital.local',
defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local
defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local
defaultuserpwd: 'M@p2022', //tabteste@006,
chatOffline: true,
presidencia: false,
version: '1.0.1',
version: versionData,
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
};
src/environments/environment.ts
+4 -3
View File
@@ -1,7 +1,8 @@
import { versionData } from '../../version/git-version'
export const environment = {
// apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
apiURL: 'https://gd-api.oapr.gov.ao/api/',
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
//apiURL: 'https://gd-api.oapr.gov.ao/api/',
apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
// apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',
// apiChatUrl: 'http://192.168.0.29:3000/api/v1/',
// apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',
@@ -16,6 +17,6 @@ export const environment = {
defaultuserpwd: 'M@p2022', //tabteste@006,
chatOffline: true,
presidencia: false,
version: '1.0.1',
version: versionData,
sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'
};
version/git-version.js
+27
View File
@@ -0,0 +1,27 @@
const childProcess = require('child_process');
const { writeFileSync } = require('fs');
const longSHA = childProcess.execSync("git rev-parse HEAD").toString().trim();
const shortSHA = childProcess.execSync("git rev-parse --short HEAD").toString().trim();
const branch = childProcess.execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
const authorName = childProcess.execSync("git log -1 --pretty=format:'%an'").toString().trim();
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").toString().trim();
const versionInfo = {
shortSHA: shortSHA,
SHA : longSHA,
branch: branch,
lastCommitAuthor: authorName,
lastCommitTime: commitTime,
lastCommitMessage: commitMsg,
lastCommitNumber: totalCommitCount,
change
}
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);
version/git-version.json
+10
View File
@@ -0,0 +1,10 @@
{
"shortSHA": "8a176e684",
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4564",
"change": "diff --git a/package.json b/package.json\nindex 0c8a34696..90f3fb61a 100644\n--- a/package.json\n+++ b/package.json\n@@ -12,7 +12,8 @@\n \"test\": \"jest --detectOpenHandles --runInBand\",\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n- \"install:chromium\": \"node node_modules/puppeteer/install.js\"\n+ \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n+ \"build:version\":\"node ./version/git-version.js\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/src/app/app.component.ts b/src/app/app.component.ts\nindex 974b98ca6..127ce8ee6 100644\n--- a/src/app/app.component.ts\n+++ b/src/app/app.component.ts\n@@ -15,6 +15,7 @@ import { MessageModel } from './models/beast-orm';\n import { InativityService } from \"src/app/services/inativity.service\";\n import { ThemeService } from 'src/app/services/theme.service';\n import { environment } from 'src/environments/environment';\n+import { Storage } from '@ionic/storage';\n \n const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {\n parse: {\n@@ -48,10 +49,13 @@ export class AppComponent {\n private storageservice: StorageService,\n private InativityService: InativityService,\n public ThemeService: ThemeService,\n+ private storage: Storage,\n ) {\n // this.createCacheFolder()\n this.initializeApp();\n console.log('version: '+ environment.version)\n+\n+ this.storage.set('version', environment.version).then(() => {})\n }\n \n // async createCacheFolder(){\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f47373b90 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -95,6 +95,9 @@ export class EventsPage implements OnInit {\n this.listToPresentexpediente = []\n })\n \n+\n+ this.storage.set('events', {}).then(() => {})\n+\n }\n \n ngOnInit() {\n@@ -442,6 +445,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex b14e21e0a..9df0e95ab 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,3 +1,4 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n apiURL: 'https://gd-api.oapr.gov.ao/api/',\n@@ -11,10 +12,10 @@ export const environment = {\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n production: true,\n domain: 'gabinetedigital.local',\n- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local\n+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex f5edf8496..1e1555b02 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,7 +1,8 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n@@ -16,6 +17,6 @@ export const environment = {\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file"
}
version/git-version.ts
+10
View File
@@ -0,0 +1,10 @@
export let versionData = {
"shortSHA": "8a176e684",
"SHA": "8a176e684f1f305917326b4241fe6758d76248dc",
"branch": "develop_bitOut-fix",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Dec 22 12:45:26 2022 +0100'",
"lastCommitMessage": "save",
"lastCommitNumber": "4564",
"change": "diff --git a/package.json b/package.json\nindex 0c8a34696..90f3fb61a 100644\n--- a/package.json\n+++ b/package.json\n@@ -12,7 +12,8 @@\n \"test\": \"jest --detectOpenHandles --runInBand\",\n \"test:prof\": \"ionic build --configuration production && npm run test\",\n \"dev:share\": \"lite-server --baseDir=share\",\n- \"install:chromium\": \"node node_modules/puppeteer/install.js\"\n+ \"install:chromium\": \"node node_modules/puppeteer/install.js\",\n+ \"build:version\":\"node ./version/git-version.js\"\n },\n \"private\": true,\n \"dependencies\": {\ndiff --git a/src/app/app.component.ts b/src/app/app.component.ts\nindex 974b98ca6..127ce8ee6 100644\n--- a/src/app/app.component.ts\n+++ b/src/app/app.component.ts\n@@ -15,6 +15,7 @@ import { MessageModel } from './models/beast-orm';\n import { InativityService } from \"src/app/services/inativity.service\";\n import { ThemeService } from 'src/app/services/theme.service';\n import { environment } from 'src/environments/environment';\n+import { Storage } from '@ionic/storage';\n \n const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {\n parse: {\n@@ -48,10 +49,13 @@ export class AppComponent {\n private storageservice: StorageService,\n private InativityService: InativityService,\n public ThemeService: ThemeService,\n+ private storage: Storage,\n ) {\n // this.createCacheFolder()\n this.initializeApp();\n console.log('version: '+ environment.version)\n+\n+ this.storage.set('version', environment.version).then(() => {})\n }\n \n // async createCacheFolder(){\ndiff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts\nindex 82c822b98..f47373b90 100644\n--- a/src/app/pages/events/events.page.ts\n+++ b/src/app/pages/events/events.page.ts\n@@ -95,6 +95,9 @@ export class EventsPage implements OnInit {\n this.listToPresentexpediente = []\n })\n \n+\n+ this.storage.set('events', {}).then(() => {})\n+\n }\n \n ngOnInit() {\n@@ -442,6 +445,4 @@ export class EventsPage implements OnInit {\n }\n }\n \n-\n-\n }\n\\ No newline at end of file\ndiff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts\nindex b14e21e0a..9df0e95ab 100644\n--- a/src/environments/environment.prod.ts\n+++ b/src/environments/environment.prod.ts\n@@ -1,3 +1,4 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n apiURL: 'https://gd-api.oapr.gov.ao/api/',\n@@ -11,10 +12,10 @@ export const environment = {\n // apiChatUrl: 'https://www.tabularium.pt/api/v1/',\n production: true,\n domain: 'gabinetedigital.local',\n- defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local\n+ defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto@gabinetedigital.local\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file\ndiff --git a/src/environments/environment.ts b/src/environments/environment.ts\nindex f5edf8496..1e1555b02 100644\n--- a/src/environments/environment.ts\n+++ b/src/environments/environment.ts\n@@ -1,7 +1,8 @@\n+import { versionData } from '../../version/git-version'\n export const environment = {\n // apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',\n- apiURL: 'https://gd-api.oapr.gov.ao/api/',\n- //apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n+ //apiURL: 'https://gd-api.oapr.gov.ao/api/',\n+ apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',\n // apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/',\n // apiChatUrl: 'http://192.168.0.29:3000/api/v1/',\n // apiWsChatUrl: 'wss://192.168.0.29:3000/websocket',\n@@ -16,6 +17,6 @@ export const environment = {\n defaultuserpwd: 'M@p2022', //tabteste@006,\n chatOffline: true,\n presidencia: false,\n- version: '1.0.1',\n+ version: versionData,\n sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712'\n };\n\\ No newline at end of file"
}