Merge pull request #60 from iai-group/demo

SimLab demo

Author: NoB0

.github/actions/build_test/action.yaml

@@ -8,7 +8,11 @@ inputs:
   test_dir:
     description: "The directory containing the Python tests."
     required: true
-    
+  artifact_prefix:
+    description: "Prefix for the artifact names."
+    required: true
+    default: "coverage"
+
 runs:
   using: "composite"
   steps:
@@ -44,7 +48,7 @@ runs:
 
     - name: PyTest with code coverage
       shell: bash
-      continue-on-error: true
+      # continue-on-error: true
       run: |
         pytest --junitxml pytest.xml --cov=${{ inputs.code_dir }} --cov-report=term-missing --cov-report=xml --cov-branch ${{ inputs.test_dir }} | tee pytest-coverage.txt
 
@@ -56,22 +60,22 @@ runs:
 
     - name: Upload Coverage Results txt
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-results-txt
+        name: ${{ inputs.artifact_prefix }}-coverage-results-txt
         path: ./pytest-coverage.txt
 
     - name: Upload Coverage Results xml
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-results-xml
+        name: ${{ inputs.artifact_prefix }}-coverage-results-xml
         path: ./coverage.xml
 
     - name: Upload Unit Test Results
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: unit-test-py39
+        name: ${{ inputs.artifact_prefix }}-unit-test-py39
         path: ./pytest.xml
 

.github/actions/coverage_badge/action.yaml

@@ -14,12 +14,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: actions/checkout@v3
-    - name: Download Artifacts
-      uses: actions/download-artifact@v3
-      with:
-        path: artifacts
-
     - name: Read Coverage and Generate Badge
       shell: bash
       env:
@@ -65,12 +59,3 @@ runs:
           # Add new badge at the top
           echo "![${BADGE_TITLE}](${BADGE_URL})" | cat - README.md > temp && mv temp README.md
         fi
-
-    - name: Commit Updated README.md
-      shell: bash
-      run: |
-        git config --local user.name "github-actions[bot]"
-        git config --local user.email "github-actions[bot]@users.noreply.github.com"
-        git add README.md
-        git commit -m "Update coverage badge in README"
-        git push

.github/workflows/cd-simlab.yaml

@@ -0,0 +1,33 @@
+name: Deploy to GCP VM
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Deploy to GCP VM
+      uses: appleboy/ssh-action@v0.1.11
+      with:
+        host: ${{ secrets.GCP_VM_HOST }}
+        username: ${{ secrets.GCP_VM_USER }}
+        key: ${{ secrets.SSH_PRIVATE_KEY }}
+        port: 22
+        script: |
+          # Navigate to the application directory
+          cd /home/sharath/simlab
+
+          # Pull the latest code
+          git reset --hard
+          git pull origin master
+
+          # Build or restart your application (e.g., Docker, Node.js, etc.)
+          docker compose down
+          docker compose up -d --build

.github/workflows/ci-backend.yaml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 

.github/workflows/ci-merge.yaml

@@ -47,12 +47,7 @@ jobs:
         with:
           code_dir: "webapp/backend"
           test_dir: "tests/backend"
-
-      - name: Update coverage badge in README
-        uses: ./.github/actions/coverage_badge
-        with:
-          coverage_file: "artifacts/coverage-results-txt/pytest-coverage.txt"
-          badge_title: "backend"
+          artifact_prefix: "backend"
 
   build-and-test-simlab:
     name: "Build and Test SimLab"
@@ -69,9 +64,47 @@ jobs:
         with:
           code_dir: "simlab"
           test_dir: "tests/simlab"
+          artifact_prefix: "simlab"
+
+  update-coverage-badges:
+    name: "Update Coverage Badges in README"
+    runs-on: ubuntu-latest
+    needs: [build-and-test-backend, build-and-test-simlab]
+    timeout-minutes: 5
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-      - name: Update coverage badge in README
+      - name: Download Backend Coverage Results
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-coverage-results-txt
+          path: artifacts/backend_coverage
+      
+      - name: Download SimLab Coverage Results
+        uses: actions/download-artifact@v4
+        with:
+          name: simlab-coverage-results-txt
+          path: artifacts/simlab_coverage
+
+      - name: Update Coverage Backend Badge
         uses: ./.github/actions/coverage_badge
         with:
-          coverage_file: "artifacts/coverage-results-txt/pytest-coverage.txt"
+          coverage_file: "artifacts/backend_coverage/pytest-coverage.txt"
+          badge_title: "backend"
+
+      - name: Update Coverage SimLab Badge
+        uses: ./.github/actions/coverage_badge
+        with:
+          coverage_file: "artifacts/simlab_coverage/pytest-coverage.txt"
           badge_title: "simlab"
+
+      - name: Commit Updated README.md
+        shell: bash
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git add README.md
+          git commit -m "Update coverage badge in README"
+          git push 

.github/workflows/ci-simlab.yaml

@@ -54,7 +54,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 

.gitignore

@@ -128,10 +128,10 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-
-dialoguekit/
 nginx/ssl/
 data/mongo/*
+data/datasets/*
+data/simlab/configs/*
 
 # Ignore all .DS_Store files
 **/.DS_Store