Skip to content

Commit

Permalink
Merge pull request #394 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
khalima authored Jan 31, 2024
2 parents d04fa5c + 16e1442 commit 5d2b3cb
Show file tree
Hide file tree
Showing 37 changed files with 217 additions and 141 deletions.
69 changes: 69 additions & 0 deletions .github/workflows/npm-audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: Npm audit

on:
workflow_dispatch:
schedule:
- cron: '0 12 * * 0' # Run every fortnight on Sunday at 12

jobs:
npm_audit:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run npm audit
id: npm_audit
run: |
find public/modules/custom public/themes/custom -type f -name ".nvmrc" -exec sh -c '
dir=$(dirname "$1")
node_version=$(cat "$1")
echo "Using Node.js version $node_version in $dir"
cd "$dir"
export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install $node_version
nvm use $node_version
set +e
npm audit --package-lock-only --loglevel=error;
# The npm audit command will exit with a 0 exit code if no vulnerabilities were found.
if [ $? -gt 0 ]; then
npm audit fix --package-lock-only --loglevel=error;
if [ $? -gt 0 ]; then
echo "BC_BREAK=:exclamation: NPM Audit fix could not fix all vulnerabilities. Fix them manually by running \`npm audit fix --force\` and test the functionalities thoroughly as there might be breaking changes. :exclamation:" >> $GITHUB_ENV;
fi;
echo "CREATE_PR=true" >> $GITHUB_OUTPUT;
fi;
set -e
' sh {} \;
- name: Create Pull Request
if: steps.npm_audit.outputs.CREATE_PR == 'true'
uses: peter-evans/create-pull-request@v4
with:
committer: GitHub <[email protected]>
author: actions-bot <[email protected]>
commit-message: Updated node modules based on npm audit fix
title: Automatic npm audit fix
labels: auto-update
body: |
# Npm audit
${{ env.BC_BREAK }}
## How to install
* Update the HDBT theme
* `git fetch --all`
* `git checkout automation/npm-audit`
* `git pull origin automation/npm-audit`
* In the custom module or custom theme folder, run `nvm use && npm i && npm run build`
## How to test
Run `npm audit`
* [ ] Check that the `npm audit` prints `found 0 vulnerabilities`
* [ ] Check that the changes for distributed files are sensible
branch: automation/npm-audit
106 changes: 51 additions & 55 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- media_library
- text
_core:
default_config_hash: ZzwlJ2SwF1RVqS2C99xcFRBm5QTF6HqHjtgtQTBxAq8
default_config_hash: JfX1NDmZllc_fHMeOSFBgWspFRoEEmivcXOUu014O-k
id: paragraph.chart.default
targetEntityType: paragraph
bundle: chart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- media_library
- text
_core:
default_config_hash: 8PkD28wd76Uxb7Lxrd8Js9613dKfCawFNWaoOv5PhF0
default_config_hash: 7crENIwhGW6tRoex4OmKX32kDMRWvLBJ-YjDSBifPak
id: paragraph.map.default
targetEntityType: paragraph
bundle: map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
module:
- text
_core:
default_config_hash: z5HcA-kCryhCEDDUh3GMvbVm_xuff7CohDimxV11670
default_config_hash: BOw_UiW-L7EQ8Y6D4E0CAMkB8XxXao5rBZzbq-DNbBI
id: paragraph.chart.default
targetEntityType: paragraph
bundle: chart
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ content:
settings:
image_link: ''
image_style: 1_1_l
image_loading:
attribute: lazy
third_party_settings: { }
weight: 0
region: content
Expand Down
Loading

0 comments on commit 5d2b3cb

Please sign in to comment.