Merge branch 'main' into dependabot/pip/pre-commit-4.0.1

NHSDigital · Oct 9, 2024 · b2456ad · b2456ad
2 parents 3232bd9 + c63c9a1
commit b2456ad
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 43 deletions.
diff --git a/.github/workflows/cdk_release_code.yml b/.github/workflows/cdk_release_code.yml
@@ -159,24 +159,24 @@ jobs:
           RELEASE_TAG: ${{ inputs.VERSION_NUMBER }}
           DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
 
-      # - name: Checkout gh-pages
-      #   if: ${{ !startsWith(inputs.STACK_NAME, 'lambda-resources-pr-') }}
-      #   uses: actions/checkout@v4
-      #   with:
-      #     ref: gh-pages
-      #     path: gh-pages
+      - name: Checkout gh-pages
+        if: ${{ !startsWith(inputs.STACK_NAME, 'lambda-resources-pr-') }}
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+          path: gh-pages
 
-      # - name: update release tag in github pages
-      #   if: ${{ inputs.TARGET_ENVIRONMENT != 'dev-pr' }}
-      #   run: |
-      #     cd gh-pages
-      #     NOW=$(date +'%Y-%m-%dT%H:%M:%S')
-      #     echo "tag,release_datetime" > _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
-      #     echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
-      #     echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
-      #     git config user.name github-actions
-      #     git config user.email [email protected]
-      #     git add _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
-      #     git add _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
-      #     git commit -m 'update releases for ${{ inputs.TARGET_ENVIRONMENT }}'
-      #     parallel --retries 10 --delay 3 ::: "git pull --rebase && git push"
+      - name: update release tag in github pages
+        if: ${{ inputs.TARGET_ENVIRONMENT != 'dev-pr' }}
+        run: |
+          cd gh-pages
+          NOW=$(date +'%Y-%m-%dT%H:%M:%S')
+          echo "tag,release_datetime" > _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
+          echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
+          echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
+          git config user.name github-actions
+          git config user.email [email protected]
+          git add _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
+          git add _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
+          git commit -m 'update releases for ${{ inputs.TARGET_ENVIRONMENT }}'
+          parallel --retries 10 --delay 3 ::: "git pull --rebase && git push"
diff --git a/.github/workflows/quality_checks.yml b/.github/workflows/quality_checks.yml
@@ -68,8 +68,8 @@ jobs:
           name: cfn_guard_output
           path: cfn_guard_output
 
-      # - name: SonarCloud Scan
-      #   uses: SonarSource/sonarcloud-github-action@master
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,15 +23,6 @@ repos:
 
   - repo: local
     hooks:
-      - id: lint-client
-        name: Lint client
-        entry: npm
-        args: ["run", "--prefix=packages/client", "lint"]
-        language: system
-        files: ^packages\/client
-        types_or: [ts, tsx, javascript, jsx, json]
-        pass_filenames: false
-
       - id: lint-cdk
         name: Lint cdk
         entry: npm
@@ -41,15 +32,6 @@ repos:
         types_or: [ts, tsx, javascript, jsx, json]
         pass_filenames: false
 
-      - id: lint-server
-        name: Lint server
-        entry: npm
-        args: ["run", "--prefix=packages/server", "lint"]
-        language: system
-        files: ^packages\/server
-        types_or: [ts, tsx, javascript, jsx, json]
-        pass_filenames: false
-
       - id: lint-githubactions
         name: Lint github actions
         entry: make