LaconicNetwork/vega-frontend-monorepo
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix: use netlify git env vars (#727)

Browse Source 
* fix: use netlify git env vars

* fix: make git info vars optional in env

* fix: remove git info parsing, and use netlify only

* fix: handle missing git repo url

* fix: format
This commit is contained in:
botond 2022-07-08 11:19:05 +01:00 committed by GitHub
parent 76386a2a57
commit 80dee1e03d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/environment/src/utils/validate-environment.ts
View File

@ -23,9 +23,9 @@ const schemaObject = {
ETHERSCAN_URL: z.string().url({ ETHERSCAN_URL: z.string().url({
message: 'The NX_ETHERSCAN_URL environment variable must be a valid url', message: 'The NX_ETHERSCAN_URL environment variable must be a valid url',
}), }),
GIT_BRANCH: z.string(), GIT_BRANCH: z.optional(z.string()),
GIT_COMMIT_HASH: z.string(), GIT_COMMIT_HASH: z.optional(z.string()),
GIT_ORIGIN_URL: z.string(), GIT_ORIGIN_URL: z.optional(z.string()),
GITHUB_FEEDBACK_URL: z.optional(z.string()), GITHUB_FEEDBACK_URL: z.optional(z.string()),
VEGA_ENV: z.nativeEnum(Networks), VEGA_ENV: z.nativeEnum(Networks),
VEGA_NETWORKS: z VEGA_NETWORKS: z

10
libs/network-info/src/network-info.tsx
View File

@ -43,12 +43,16 @@ export const NetworkInfo = () => {
</Lozenge> </Lozenge>
.{' '} .{' '}
</p> </p>
{GIT_COMMIT_HASH && GIT_ORIGIN_URL && ( {GIT_COMMIT_HASH && (
<p className="mb-[1rem]"> <p className="mb-[1rem]">
{t('Version/commit hash')}:{' '} {t('Version/commit hash')}:{' '}
<Link <Link
href={`${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`} href={
target="_blank" GIT_ORIGIN_URL
? `${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`
: undefined
}
target={GIT_ORIGIN_URL ? '_blank' : undefined}
> >
{GIT_COMMIT_HASH} {GIT_COMMIT_HASH}
</Link> </Link>

15
tools/utils/setup-environment.ts
View File

@ -1,21 +1,12 @@
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { execSync } from 'child_process';
import * as log from 'npmlog'; import * as log from 'npmlog';
import * as dotenv from 'dotenv'; import * as dotenv from 'dotenv';
import type { ExecutorContext } from '@nrwl/devkit'; import type { ExecutorContext } from '@nrwl/devkit';
process.env['NX_GIT_COMMIT_HASH'] = execSync('git rev-parse HEAD') process.env['NX_GIT_COMMIT_HASH'] = process.env['COMMIT_REF'] ?? 'dev';
.toString() process.env['NX_GIT_BRANCH'] = process.env['BRANCH'] ?? 'dev';
.replace(/[\r\n]/gm, ''); process.env['NX_GIT_ORIGIN_URL'] = process.env['REPOSITORY_URL'] ?? '';
process.env['NX_GIT_BRANCH'] = execSync('git rev-parse --abbrev-ref HEAD')
.toString()
.replace(/[\r\n]/gm, '');
process.env['NX_GIT_ORIGIN_URL'] = execSync('git remote get-url origin')
.toString()
.replace('ssh://git@', 'https://')
.replace('.git', '')
.replace(/[\r\n]/gm, '');
const logEnvData = ( const logEnvData = (
envMap: Record<string, string>, envMap: Record<string, string>,