Skip to content

Commit 7030da6

Browse files
committed
move build to use development environment and simplify npm generate
1 parent 8900e0a commit 7030da6

1 file changed

Lines changed: 20 additions & 44 deletions

File tree

.github/workflows/pre-merge.yml

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,28 @@ on:
55
branches: ['dev']
66
pull_request:
77
branches: ['dev']
8-
env:
9-
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
10-
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
11-
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
12-
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
13-
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
14-
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
15-
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
16-
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
17-
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
18-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
19-
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
20-
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
21-
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
22-
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
23-
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
8+
249

2510
jobs:
2611
build:
2712
runs-on: ubuntu-latest
28-
13+
environment: development
14+
env:
15+
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
16+
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
17+
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
18+
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
19+
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
20+
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
21+
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
22+
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
23+
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
24+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
25+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
26+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
27+
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
28+
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
29+
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
2930
strategy:
3031
matrix:
3132
node-version: [20.x]
@@ -42,33 +43,8 @@ jobs:
4243
run: npm ci --force
4344

4445
- name: Generate GraphQL types (CI-safe)
45-
run: |
46-
# Ensure generated directory exists
47-
mkdir -p ./gql/generated
48-
49-
# Try to generate with timeout and fallback
50-
timeout 60s npm run generate:ci || {
51-
echo "GraphQL codegen failed or timed out, checking for existing files..."
52-
if [ -d "./gql/generated" ] && [ "$(ls -A ./gql/generated 2>/dev/null)" ]; then
53-
echo "Using existing generated files"
54-
else
55-
echo "Creating minimal generated files for build to proceed"
56-
echo "// Auto-generated fallback file for CI builds" > ./gql/generated/index.ts
57-
echo "export type Maybe<T> = T | null;" >> ./gql/generated/index.ts
58-
echo "export type Scalars = {" >> ./gql/generated/index.ts
59-
echo " ID: string;" >> ./gql/generated/index.ts
60-
echo " String: string;" >> ./gql/generated/index.ts
61-
echo " Boolean: boolean;" >> ./gql/generated/index.ts
62-
echo " Int: number;" >> ./gql/generated/index.ts
63-
echo " Float: number;" >> ./gql/generated/index.ts
64-
echo "};" >> ./gql/generated/index.ts
65-
echo "export {};" >> ./gql/generated/index.ts
66-
echo "Created fallback generated files"
67-
fi
68-
}
46+
run: npm run generate
6947
env:
70-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
71-
NODE_ENV: 'production'
72-
48+
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL}}
7349
- name: Build application
7450
run: npm run build --if-present

0 commit comments

Comments
 (0)