Merge pull request #23 from NHSDigital/refactor-testingbranch-workflow

Refactor testingbranch workflow

Author: ryma2fhir

.github/workflows/testingbranch.yml

@@ -20,7 +20,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      
 
       - name: Check out validation-service-fhir-r4
         uses: actions/checkout@master
@@ -29,51 +28,18 @@ jobs:
           ref: main2
           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_16.x | sudo -E bash -
-          sudo apt-get install -y nodejs
-          
-      - name: Cache node modules
+      - name: Cache Maven packages
         uses: actions/cache@v3
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2-
 
       - name: Install npm
         run: npm ci
 
-      - name: Update FHIR Validator install
-        run: make -C validation-service-fhir-r4 install
-        
       - name: Update FHIR Validator build
-        run: make -C validation-service-fhir-r4 build
+        run: cd validation-service-fhir-r4; mvn clean package
 
       - name: Run FHIR Validator
         run: