Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 75 additions & 18 deletions .github/workflows/deploy-Dataspace-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ name: Update DataSpace Dev
on:
push:
branches: ['dev']
env:
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}


jobs:
deploy:
name: Deploy to Dev Server
runs-on: ubuntu-latest
env:
KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_CLIENT_ID }}
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_CLIENT_SECRET }}
AUTH_ISSUER: ${{ secrets.AUTH_ISSUER }}
NEXTAUTH_URL: ${{ secrets.NEXTAUTH_URL }}
NEXT_PUBLIC_NEXTAUTH_URL: ${{ secrets.NEXT_PUBLIC_NEXTAUTH_URL }}
NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
END_SESSION_URL: ${{ secrets.END_SESSION_URL }}
REFRESH_TOKEN_URL: ${{ secrets.REFRESH_TOKEN_URL }}
NEXT_PUBLIC_BACKEND_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_URL }}
BACKEND_GRAPHQL_URL: ${{ secrets.BACKEND_GRAPHQL_URL }}
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{ secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL }}
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{ secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL }}
BACKEND_URL: ${{ secrets.BACKEND_URL }}
NEXT_PUBLIC_PLATFORM_URL: ${{ secrets.NEXT_PUBLIC_PLATFORM_URL }}
NEXT_PUBLIC_ANALYTICS_URL: ${{ secrets.NEXT_PUBLIC_ANALYTICS_URL }}

steps:
- name: Checkout code
Expand All @@ -44,6 +44,16 @@ jobs:
- name: Rename public to public2
run: mv public public2

- name: Backup existing .next and public folders
uses: appleboy/[email protected]
with:
host: ${{ secrets.EC2_HOST_DEV_DS }}
username: ${{ secrets.EC2_USERNAME_DS }}
key: ${{ secrets.EC2_PRIVATE_KEY }}
script: |
cp -r DataExchange/DataExFrontend/.next DataExchange/DataExFrontend/.next_backup || true
cp -r DataExchange/DataExFrontend/public DataExchange/DataExFrontend/public_backup || true

- name: Send .next2 to EC2
uses: appleboy/scp-action@master
with:
Expand All @@ -68,4 +78,51 @@ jobs:
host: ${{ secrets.EC2_HOST_DEV_DS }}
username: ${{ secrets.EC2_USERNAME_DS }}
key: ${{ secrets.EC2_PRIVATE_KEY }}
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
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

smoke:
name: Run Smoke Tests from QA Repo
needs: deploy
uses: saqibmanan/CivicDataSpace-test/.github/workflows/run-smoke.yml@dev
secrets:
BASE_URL: ${{ secrets.BASE_URL }}
HOME_URL_DEV: ${{ secrets.HOME_URL_DEV }}
TEST_EMAIL_1: ${{ secrets.TEST_EMAIL_1 }}
TEST_PASSWORD_1: ${{ secrets.TEST_PASSWORD_1 }}
TEST_EMAIL_2: ${{ secrets.TEST_EMAIL_2 }}
TEST_PASSWORD_2: ${{ secrets.TEST_PASSWORD_2 }}
QA_REPO_PAT: ${{ secrets.QA_REPO_PAT }}

revert_deploy:
name: Revert Deployment on Smoke Test Failure
needs: smoke_tests
if: failure()
runs-on: ubuntu-latest

steps:
- name: Revert to Backup Build on EC2
uses: appleboy/[email protected]
with:
host: ${{ secrets.EC2_HOST_DEV_DS }}
username: ${{ secrets.EC2_USERNAME_DS }}
key: ${{ secrets.EC2_PRIVATE_KEY }}
script: |
rm -rf DataExchange/DataExFrontend/.next
rm -rf DataExchange/DataExFrontend/public
mv DataExchange/DataExFrontend/.next_backup DataExchange/DataExFrontend/.next
mv DataExchange/DataExFrontend/public_backup DataExchange/DataExFrontend/public
/home/ubuntu/.nvm/versions/node/v20.11.1/bin/pm2 restart dataspace

notify_success:
name: ✅ Deployment & Smoke Test Passed
needs: smoke_tests
if: success()
runs-on: ubuntu-latest

steps:
- run: echo "✅ Smoke tests passed. Deployment is stable."
19 changes: 1 addition & 18 deletions .github/workflows/pre-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,6 @@ on:
branches: ['dev']
pull_request:
branches: ['dev']
env:
KEYCLOAK_CLIENT_ID: ${{secrets.KEYCLOAK_CLIENT_ID}}
KEYCLOAK_CLIENT_SECRET: ${{secrets.KEYCLOAK_CLIENT_SECRET}}
AUTH_ISSUER: ${{secrets.AUTH_ISSUER}}
NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
NEXT_PUBLIC_NEXTAUTH_URL: 'https://dev.civicdataspace.in/'
NEXTAUTH_SECRET: ${{secrets.NEXTAUTH_SECRET}}
END_SESSION_URL: ${{secrets.END_SESSION_URL}}
REFRESH_TOKEN_URL: ${{secrets.REFRESH_TOKEN_URL}}
NEXT_PUBLIC_BACKEND_URL: ${{secrets.NEXT_PUBLIC_BACKEND_URL_DEV_DS}}
BACKEND_GRAPHQL_URL: ${{secrets.BACKEND_GRAPHQL_URL_DEV_DS}}
NEXT_PUBLIC_ENABLE_ACCESSMODEL: ${{secrets.NEXT_PUBLIC_ENABLE_ACCESSMODEL_DS}}
NEXT_PUBLIC_BACKEND_GRAPHQL_URL: ${{secrets.NEXT_PUBLIC_BACKEND_GRAPHQL_URL_DEV_DS}}
BACKEND_URL: ${{secrets.BACKEND_URL_DEV}}
NEXT_PUBLIC_PLATFORM_URL: ${{secrets.NEXT_PUBLIC_PLATFORM_URL_DEV}}
NEXT_PUBLIC_ANALYTICS_URL: ${{secrets.NEXT_PUBLIC_ANALYTICS_URL}}


jobs:
build:
Expand All @@ -44,4 +27,4 @@ jobs:

- run: npm ci --force
- run: npm run generate
- run: npm run build --if-present
- run: npm run build --if-present
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@


## [0.1.4](https://github.com/CivicDataLab/DataExFrontend/compare/0.1.2dev...0.1.4) (2024-06-04)


### Features

* add query and update mutation to integrate tags in metadata form ([e2121d4](https://github.com/CivicDataLab/DataExFrontend/commit/e2121d4f4db762ee75cde4c7053bac1757921411))

## [0.1.3](https://github.com/CivicDataLab/DataExFrontend/compare/0.1.2...0.1.3) (2024-04-15)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-exchange-frontend",
"version": "0.1.3",
"version": "0.1.4",
"private": true,
"scripts": {
"dev": "graphql-codegen --config ./config/codegen.ts && next dev",
Expand Down