Merge pull request #21 from NHSDigital/update/yml

removed redundant code from masterfhirvalidation.yml, including python and poetry

Author: ryma2fhir

.github/workflows/masterfhirvalidation.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Check out IOPS-Validation
         uses: actions/checkout@master
         with:
-          repository: NHSDigital/IOPS-Validation
+          repository: NHSDigital/IOPS-FHIR-Test-Scripts # orignally known as NHSDigital/IOPS-Validation
           path: validation
 
       - name: Check out validation-service-fhir-r4
@@ -38,49 +38,12 @@ jobs:
           repository: NHSDigital/IOPS-FHIR-Validation-Service
           ref: main
           path: validation-service-fhir-r4
-        
-      - name: Install Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.8
-
-      - name: Upgrade python packaging tools
-        run: python -m pip install --upgrade pip setuptools wheel
-
-      - name: Install poetry and requests
-        run: pip install poetry requests
-
-      - name: Install dependencies
-        run: poetry install
-
-      - name: Set SPEC_VERSION env var
-        run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py)
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-
-      - name: Install node
-        run: |
-          wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-          curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash -
-          sudo apt-get install -y nodejs
-          
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}
-          
+                    
       - name: Install npm
-        run: make -C validation install
+        run: cd validation && npm ci
 
       - name: Configure FHIR Validator
-        run: make -C validation configure-validation
+        run: cd validation && npm start
         env:
           CI: true
           ONTO_CLIENT_ID: ${{ secrets.ONTO_CLIENT_ID }}
@@ -95,4 +58,4 @@ jobs:
           sleep 120
 
       - name: Run Test
-        run: make -C validation test
+        run: cd validation && npm test

.github/workflows/testingbranch.yml

@@ -67,7 +67,7 @@ jobs:
           key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}
 
       - name: Install npm
-        run: make install
+        run: npm ci
 
       - name: Update FHIR Validator install
         run: make -C validation-service-fhir-r4 install