Skip to content

Commit

Permalink
conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
ManojNathIC committed Nov 20, 2024
2 parents 725dd3e + 4e0b540 commit a0824f7
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 4 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/dev-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Deploy to ISSUANCE DEV
on:
push:
branches:
- main
jobs:
Deploy:
name: Deploy to DEV
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Deploy to DEV
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY_DEV }}
REMOTE_HOST: ${{ secrets.HOST_NAME_DEV }}
REMOTE_USER: ${{ secrets.USERNAME_DEV }}


- name: Set up SSH key
run: |
mkdir -p ~/.ssh
echo "${{ secrets.SSH_KEY_DEV }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
# Add the SSH key to the known_hosts file (replace hostname with your actual hostname)
ssh-keyscan -H ${{ secrets.HOST_NAME_DEV}} >> ~/.ssh/known_hosts
sudo apt-get install sshpass
- name: Deploy to server
run: |
sshpass -p '${{ secrets.SSH_KEY_DEV }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.USERNAME_DEV }}@${{ secrets.HOST_NAME_DEV }} <<'ENDSSH'
cd ${{ secrets.TARGET_DEV_DIR }}
./deploy.sh
ENDSSH
36 changes: 36 additions & 0 deletions .github/workflows/uat-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Deploy to Issuance to UAT
on:
push:
branches:
- main
jobs:
Deploy:
name: Deploy to UAT
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Deploy to UAT
uses: easingthemes/ssh-deploy@main
env:
SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY_UAT }}
REMOTE_HOST: ${{ secrets.HOST_NAME_UAT }}
REMOTE_USER: ${{ secrets.USERNAME_UAT }}


- name: Set up SSH key
run: |
mkdir -p ~/.ssh
echo "${{ secrets.SSH_KEY_UAT }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
# Add the SSH key to the known_hosts file (replace hostname with your actual hostname)
ssh-keyscan -H ${{ secrets.HOST_NAME_UAT}} >> ~/.ssh/known_hosts
sudo apt-get install sshpass
- name: Deploy to server
run: |
sshpass -p '${{ secrets.SSH_KEY_UAT }}' ssh -v -o StrictHostKeyChecking=no ${{ secrets.USERNAME_UAT }}@${{ secrets.HOST_NAME_UAT }} <<'ENDSSH'
cd ${{ secrets.TARGET_UAT_DIR }}
./deploy.sh
ENDSSH
2 changes: 0 additions & 2 deletions src/examiner/examiner.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,11 @@ export class ExaminerService {
if (result.status === 'fulfilled') {
return {
status: 'fulfilled',

result: result.value.result,
};
} else {
return {
status: 'rejected',

reason: result.reason,
};
}
Expand Down
2 changes: 0 additions & 2 deletions src/services/credentials/credentials.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ export class CredentialsService {
);
return response.data;
} catch (error) {
console.log('333333333333333333333333333', error);

throw new HttpException('Credential not Found!', HttpStatus.NOT_FOUND);
}
}
Expand Down

0 comments on commit a0824f7

Please sign in to comment.