Skip to content

Commit 90b5636

Browse files
bhavabhuthibhavabhuthi
authored
Merge pull request #290 from CivicDataLab/test_workflow_automation
Test workflow automation
2 parents f04d0f0 + 7d19ab3 commit 90b5636

File tree

2 files changed

+72
-38
lines changed

2 files changed

+72
-38
lines changed

‎.github/workflows/deploy-Dataspace-dev.yml‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,43 @@
11
name: Update DataSpace Dev
22

33
on:
4-
push:
5-
branches: ['dev']
6-
env:
7-
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
8-
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
9-
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
10-
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
11-
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
12-
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
13-
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
14-
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
15-
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
16-
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
17-
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
18-
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
19-
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
20-
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
21-
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}
22-
4+
workflow_call:
5+
secrets:
6+
KEYCLOAK_CLIENT_ID: { required: true }
7+
KEYCLOAK_CLIENT_SECRET: { required: true }
8+
AUTH_ISSUER: { required: true }
9+
NEXTAUTH_URL: { required: true }
10+
NEXT_PUBLIC_NEXTAUTH_URL: { required: true }
11+
NEXTAUTH_SECRET: { required: true }
12+
END_SESSION_URL: { required: true }
13+
REFRESH_TOKEN_URL: { required: true }
14+
NEXT_PUBLIC_BACKEND_URL: { required: true }
15+
BACKEND_GRAPHQL_URL: { required: true }
16+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: { required: true }
17+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: { required: true }
18+
BACKEND_URL: { required: true }
19+
NEXT_PUBLIC_PLATFORM_URL: { required: true }
20+
NEXT_PUBLIC_ANALYTICS_URL: { required: true }
2321

2422
jobs:
2523
deploy:
2624
runs-on: ubuntu-latest
25+
env:
26+
KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }}
27+
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
28+
AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
29+
NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
30+
NEXT_PUBLIC_NEXTAUTH_URL: ${{ secrets.NEXT_PUBLIC_NEXTAUTH_URL }}
31+
NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
32+
END_SESSION_URL: ${{ secrets.END_SESSION_URL }}
33+
REFRESH_TOKEN_URL: ${{ secrets.REFRESH_TOKEN_URL }}
34+
NEXT_PUBLIC_BACKEND_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_URL }}
35+
BACKEND_GRAPHQL_URL: ${{ secrets.BACKEND_GRAPHQL_URL }}
36+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{ secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL }}
37+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL }}
38+
BACKEND_URL: ${{ secrets.BACKEND_URL }}
39+
NEXT_PUBLIC_PLATFORM_URL: ${{ secrets.NEXT_PUBLIC_PLATFORM_URL }}
40+
NEXT_PUBLIC_ANALYTICS_URL: ${{ secrets.NEXT_PUBLIC_ANALYTICS_URL }}
2741

2842
steps:
2943
- name: Checkout code
@@ -68,4 +82,9 @@ jobs:
6882
host: ${{ secrets.EC2_HOST_DEV_DS }}
6983
username: ${{ secrets.EC2_USERNAME_DS }}
7084
key: ${{ secrets.EC2_PRIVATE_KEY }}
71-
script: rm -rf DataExchange/DataExFrontend/.next; rm -rf DataExchange/DataExFrontend/public; mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next; mv DataExchange/DataExFrontend/public2 DataExchange/DataExFrontend/public; /home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace
85+
script: |
86+
rm -rf DataExchange/DataExFrontend/.next
87+
rm -rf DataExchange/DataExFrontend/public
88+
mv DataExchange/DataExFrontend/.next2 DataExchange/DataExFrontend/.next
89+
mv DataExchange/DataExFrontend/public2 DataExchange/DataExFrontend/public
90+
/home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace

‎.github/workflows/pre-merge.yml‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
1-
name: Build Status
1+
name: Build → Smoke → Deploy Dev
22

33
on:
44
push:
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}}
24-
8+
workflow_dispatch:
259

2610
jobs:
2711
build:
@@ -45,3 +29,34 @@ jobs:
4529
- run: npm ci --force
4630
- run: npm run generate
4731
- run: npm run build --if-present
32+
33+
smoke:
34+
needs: build
35+
uses: saqibmanan/CivicDataSpace-test/.github/workflows/run-smoke.yml@main
36+
secrets:
37+
BASE_URL: ${{ secrets.BASE_URL }}
38+
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
39+
TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
40+
TEST_PASSWORD_1: ${{ secrets.TEST_PASSWORD_1 }}
41+
TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
42+
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
43+
44+
deploy:
45+
needs: smoke
46+
uses: saqibmanan/DataSpaceFrontend/.github/workflows/run-deploy-dev.yml@main
47+
secrets:
48+
KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }}
49+
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
50+
AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
51+
NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
52+
NEXT_PUBLIC_NEXTAUTH_URL: ${{ secrets.NEXT_PUBLIC_NEXTAUTH_URL }}
53+
NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
54+
END_SESSION_URL: ${{ secrets.END_SESSION_URL }}
55+
REFRESH_TOKEN_URL: ${{ secrets.REFRESH_TOKEN_URL }}
56+
NEXT_PUBLIC_BACKEND_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_URL }}
57+
BACKEND_GRAPHQL_URL: ${{ secrets.BACKEND_GRAPHQL_URL }}
58+
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{ secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL }}
59+
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL }}
60+
BACKEND_URL: ${{ secrets.BACKEND_URL }}
61+
NEXT_PUBLIC_PLATFORM_URL: ${{ secrets.NEXT_PUBLIC_PLATFORM_URL }}
62+
NEXT_PUBLIC_ANALYTICS_URL: ${{ secrets.NEXT_PUBLIC_ANALYTICS_URL }}

0 commit comments

Comments
 (0)