Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #394

Merged
merged 22 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6bae7a8
Translated job search paragraph type.
khalima Jan 16, 2024
b62bb08
Updated the order for rekry related paragraph type orders.
khalima Jan 16, 2024
9b1cba6
Added content_liftup paragraph order as it would otherwise be first i…
khalima Jan 16, 2024
e18644c
Revert "Added content_liftup paragraph order as it would otherwise be…
khalima Jan 16, 2024
2435136
Added content_liftup paragraph order as it would otherwise be first i…
khalima Jan 16, 2024
91a02be
Updated the translation for content_liftup paragraph.
khalima Jan 16, 2024
585dae2
Fixed phpcs warning
khalima Jan 16, 2024
ad62570
Merge pull request #392 from City-of-Helsinki/UHF-8975_paragraph_order
khalima Jan 18, 2024
dae1a85
Update configuration
actions-bot Jan 18, 2024
ea04678
Merge pull request #393 from City-of-Helsinki/update-configuration
khalima Jan 18, 2024
2089318
Update configuration
actions-bot Jan 22, 2024
a22bc3c
Merge pull request #395 from City-of-Helsinki/update-configuration
j-mys Jan 22, 2024
43fc4a0
Update configuration
actions-bot Jan 23, 2024
e060902
Merge pull request #396 from City-of-Helsinki/update-configuration
teroelonen Jan 23, 2024
ef73ba3
Added npm audit github action to run npm audit fix in custom modules …
khalima Jan 24, 2024
4245393
Handle BC breaks when running npm audit fix.
khalima Jan 25, 2024
74dc311
Simplified npm audit action.
khalima Jan 29, 2024
78a78e0
Merge pull request #397 from City-of-Helsinki/UHF-9380
khalima Jan 29, 2024
df5a26b
Update configuration
actions-bot Jan 30, 2024
a595a50
Merge pull request #398 from City-of-Helsinki/update-configuration
teroelonen Jan 30, 2024
aebb3a2
Update configuration
actions-bot Jan 30, 2024
16e1442
Merge pull request #399 from City-of-Helsinki/update-configuration
teroelonen Jan 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <noreply@github.com>
author: actions-bot <actions-bot@users.noreply.github.com>
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
Loading