ci(test): pipeline - test (#1588)

SwanseaUniversityMedical · Mar 15, 2024 · e255e2c · e255e2c
2 parents feb571b + a39fcd4
commit e255e2c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/testing-pipline.yml b/.github/workflows/testing-pipline.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - master
+      - Development
     paths:
       - "CodeListLibrary_project/**"
 
@@ -38,7 +39,6 @@ jobs:
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
 
     steps:
       - uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install --upgrade --upgrade-strategy eager --default-timeout 100  -r docker/requirements/test-requirements.txt
-      
+
       - name: Prepare Selenium
         uses: nanasess/setup-chromedriver@v2
 
@@ -80,7 +80,6 @@ jobs:
           chromedriver --url-base=/wd/hub &
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
 
-
       - name: Run application
         run: |
           export $(grep -v '^#' docker/selenium-testing/env/remotetest.compose.env | xargs)
@@ -126,7 +125,7 @@ jobs:
         with:
           allure_results: CodeListLibrary_project/clinicalcode/tests/allure-results
           allure_report: CodeListLibrary_project/clinicalcode/tests/allure-report
-          allure_history: allure-history 
+          allure_history: allure-history
           gh_pages: testing-result-pages
           report_url: https://meek-florentine-a03d43.netlify.app
           keep_reports: 15 # Specify the number of previous reports to keep
@@ -137,14 +136,16 @@ jobs:
         with:
           name: allure-report
           path: CodeListLibrary_project/clinicalcode/tests/allure-report
-      
+
       - name: Publish to Netlify
-        uses: netlify/actions/cli@master
+        uses: nwtgck/actions[email protected]
         if: (success() || failure()) && github.event_name != 'pull_request'
         with:
-          args: deploy --dir=allure-history --prod --functions=functions
+          publish-dir: './allure-history'
+          production-deploy: true
+          deploy-message: 'Deployed to https://meek-florentine-a03d43.netlify.app'
         env:
-          NETLIFY_SITE_ID:   ${{secrets.NETLIFY_SITE_ID}}
+          NETLIFY_SITE_ID: ${{secrets.NETLIFY_SITE_ID}}
           NETLIFY_AUTH_TOKEN: ${{secrets.NETLIFY_AUTH_TOKEN}}
         timeout-minutes: 1
 
@@ -157,4 +158,3 @@ jobs:
           PUBLISH_DIR: allure-history
         with:
           keepFiles: true
-
diff --git a/CodeListLibrary_project/cll/templates/cl-docs/terms-conditions.html b/CodeListLibrary_project/cll/templates/cl-docs/terms-conditions.html
@@ -66,6 +66,12 @@ <h3 class="subheader">
                 <li>Unauthorised use of this website may give rise to a claim for damages and/or be a criminal offence.</li>
                 <li>From time to time this website may also include links to other websites. These links are provided for your convenience to provide further information. They do not signify that we endorse the website(s). We have no responsibility for the content of the linked website(s).</li>
                 <li>Your use of this website and any dispute arising out of such use of the website is subject to the laws of England, Northern Ireland, Scotland and Wales.</li>
+                <li>
+                  User-submitted content held in the Library is openly licensed for non-commercial use via 
+                  <a href='https://creativecommons.org/licenses/by-sa/4.0/'>
+                    CC BY-SA 4.0
+                  </a>.
+                </li>
               </ul>
             </section>
             <section class="about-container__section__text">

diff --git a/CodeListLibrary_project/cll/templates/components/base/footer.html b/CodeListLibrary_project/cll/templates/components/base/footer.html
@@ -22,7 +22,13 @@
 					<a href="{% url 'contact_us' %}">Contact Us</a>
         </p>
         <p>
-          Copyright &copy; {% now 'Y' %} - SAIL Databank - Swansea University. All rights reserved.
+          Copyright &copy; {% now 'Y' %} - SAIL Databank - Swansea University. 
+          User-submitted content held in the Library is openly licensed for 
+          non-commercial use via 
+          <a href='https://creativecommons.org/licenses/by-sa/4.0/'>
+            CC BY-SA 4.0
+          </a>.
+          All other rights reserved.
         </p>
 
         {% block footer_links %}