Skip to content

Commit

Permalink
Merge branch 'next' into 2668-npm-as
Browse files Browse the repository at this point in the history
  • Loading branch information
as2024ad authored Dec 6, 2024
2 parents 4b232cb + 5d8cc8d commit d3f3524
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:

- package-ecosystem: github-actions
directory: /
schedule:
interval: 'daily'
labels:
- github-actions
- dependabot
16 changes: 9 additions & 7 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Static code analysis

on:
workflow_dispatch:
pull_request:
branches:
- main
- next
types: [opened, synchronize, reopened]
# branches: ["next", "main", "release/**", "feature/**", "fix/**"]

jobs:
code-analysis:
name: Static code analysis
Expand All @@ -14,29 +16,29 @@ jobs:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: "zulu" # Alternative distribution options are available.

- name: Cache SonarCloud packages
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~\sonar\cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Cache SonarCloud scanner
id: cache-sonar-scanner
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~\sonar\cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Cache SonarCloud coverage
id: cache-sonar-coverage
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~\sonar\cache
key: ${{ runner.os }}-coverage
Expand Down
2 changes: 1 addition & 1 deletion Childrens-Social-Care-CPD/Views/Shared/_Header.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<header class="dfe-header" role="banner">
<div class="dfe-width-container dfe-header__container">
<div class="dfe-header__logo">
<a class="dfe-header__link dfe-header__link--service " href="/" aria-label="DfE homepage">
<a class="dfe-header__link dfe-header__link--service " href="https://gov.uk" aria-label="DfE homepage">
<img src="/assets/images/dfe-logo.png" class="dfe-logo" alt="DfE Homepage">
<img src="/assets/images/dfe-logo-alt.png" class="dfe-logo-hover" alt="DfE Homepage">
</a>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# childrens-social-care-cpd

This repository contains the code needed to host the Social Workforce career progression service. This service helps workers in this profession to easily find information about the pathways to further their career.

## Live examples
Expand Down

0 comments on commit d3f3524

Please sign in to comment.