Merge pull request #245 from NHSDigital/mesh-0000-update-project-tooling

Mesh-0000 update project tooling

Author: alexhawdon

.github/dependabot.yml

@@ -8,9 +8,20 @@ updates:
   - package-ecosystem: "pip"
     directory: "/" # Location of package manifests
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "npm"
     directory: "/" # Location of package manifests
     schedule:
-      interval: "monthly"
+      interval: "weekly"
+    cooldown:
+      default-days: 7
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 7

.github/workflows/continous-integration-workflow.yaml

@@ -1,61 +1,51 @@
-name: Build	
-
-on: push	
-
-jobs:	
-  build:	
-    name: build	
-    runs-on: ubuntu-latest	
-    steps:	
-      - name: Checkout	
-        uses: actions/checkout@v4
-        with:	
-          fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function	
-
-      - name: Install Python 3.8	
-        uses: actions/setup-python@v4
-        with:	
-          python-version: 3.8
-
-      - name: Update apt repositories	
-        run: sudo apt update	
-
-      - name: Install Java and Node	
-        run: sudo apt-get install --yes default-jre default-jdk nodejs	
-
-      - name: Upgrade python packaging tools	
-        run: python -m pip install --upgrade pip setuptools wheel	
-
-      - name: Install poetry	
-        run: pip install poetry	
-
-      - name: Cache poetry packages	
-        uses: actions/cache@v3
-        with:	
-          path: ~/.cache/pypoetry	
-          key: ${{ runner.os }}-build-cache-poetry-packages-${{ hashFiles('**/poetry.lock') }}	
-
-      - name: Cache node modules	
-        uses: actions/cache@v3
-        with:	
-          path: ~/.npm	
-          key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}	
-
-      - name: Install repo	
-        run: make install	
-      
+name: Build
+
+on: push
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
+        with:
+          fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
+
+      - name: Install Java
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654  # v5.2.0
+        with:
+          distribution: 'temurin'
+          java-version-file: '.tool-versions'
+
+      - name: Install Node
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f  # v6.3.0
+        with:
+          node-version-file: '.tool-versions'
+          cache: 'npm'
+
+      - name: Install poetry
+        run: pipx install poetry==$(grep '^poetry ' .tool-versions | awk '{print $2}')
+
+      - name: Install Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
+        with:
+          python-version-file: '.tool-versions'
+          cache: 'poetry'
+
+      - name: Install repo
+        run: make 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
+        run: echo "SPEC_VERSION=$(poetry run python scripts/calculate_version.py)" >> $GITHUB_ENV
 
       - name: Create release (master only)
         id: create-release
         if: github.ref == 'refs/heads/master'
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe  # v2.6.1
         continue-on-error: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ env.SPEC_VERSION }}
-          release_name: ${{ env.SPEC_VERSION }}
+          name: ${{ env.SPEC_VERSION }}

.github/workflows/pr-lint.yaml

@@ -15,12 +15,12 @@ jobs:
         env:
           PR_REF: ${{ github.event.pull_request.head.ref }}
         run: |
-          TICKET_NAME=$(echo "$PR_REF" | grep -i -o '\(\(apm\|mesh\|mesh2cloud\|spinecore\|spii\|apmspii\|amp\)-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')
+          TICKET_NAME=$(echo "$PR_REF" | grep -i -o '\(\(apm\|mesh\|mesh2cloud\|spinecore\|spii\|apmspii\|amp\|mns\)-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')
           echo "TICKET_NAME=$TICKET_NAME" >> $GITHUB_ENV
 
       - name: Comment on PR
         if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'mesh-') || contains(github.event.pull_request.head.ref, 'MESH-') || contains(github.event.pull_request.head.ref, 'mesh2cloud-') || contains(github.event.pull_request.head.ref, 'MESH2CLOUD-') || contains(github.event.pull_request.head.ref, 'spii-') || contains(github.event.pull_request.head.ref, 'SPII-') || contains(github.event.pull_request.head.ref, 'spinecore-') || contains(github.event.pull_request.head.ref, 'SPINECORE-')
-        uses: unsplash/comment-on-pr@master
+        uses: unsplash/comment-on-pr@ffe8f97ccc63ce12c3c23c6885b169db67958d3b  # v1.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/scheduled-combine-dependabot-prs.yaml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: combine-prs
         id: combine-prs
-        uses: github/combine-prs@v5.0.0
+        uses: github/combine-prs@2909f404763c3177a456e052bdb7f2e85d3a7cb3  # v5.2.0
         with:
           ci_required: ${{ inputs.ci_required == 'YES' }}
           labels: dependencies

.tool-versions

@@ -1,3 +1,4 @@
-python 3.8.18
-nodejs 24.7.0
-poetry 1.8.5
+python 3.13.12
+nodejs 24.14.1
+poetry 2.3.3
+java temurin-21.0.10+7.0.LTS

Makefile

@@ -44,7 +44,7 @@ check-licenses:
 	scripts/check_python_licenses.sh
 
 format:
-	poetry run black **/*.py
+	poetry run black .
 
 release: clean publish
 	mkdir -p dist

openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.14.0"
+    "version": "7.21.0"
   }
 }