Skip to content

Commit

Permalink
Merge pull request #2364 from alan-turing-institute/release-v5.3.0
Browse files Browse the repository at this point in the history
Release v5.3.0
  • Loading branch information
craddm authored Jan 20, 2025
2 parents bf91ec0 + 222deee commit de563f8
Show file tree
Hide file tree
Showing 46 changed files with 1,144 additions and 354 deletions.
9 changes: 9 additions & 0 deletions .github/resources/AdGuardHome.mustache.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"admin_username": "admin",
"admin_password_encrypted": "password",
"allow_workspace_internet": true,
"filter_allow": [
"clamav.net",
"current.cvd.clamav.net"
]
}
24 changes: 24 additions & 0 deletions .github/scripts/expand_mustache.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
echo '{"array": ["dummy"], "variable": "dummy"}' > .mustache_config.json

while read -r yamlfile; do

filename=$(basename -- "$yamlfile")
filename="${filename%.*}"
test_config=".github/resources/$filename.config.json"

if [ -e "$test_config" ]; then
cp "$yamlfile" expanded.tmp
mustache "$test_config" expanded.tmp > "$yamlfile"
else
# replace mustache arrays
sed "s|{{\([/#]\)[^}]*}}|{{\1array}}|g" "$yamlfile" > expanded.tmp
# replace mustache variables
sed -i "s|{{[^#/].\{1,\}}}|{{variable}}|g" expanded.tmp
# perform mustache expansion overwriting original file
mustache .mustache_config.json expanded.tmp > "$yamlfile"
fi

done < <(find . -name "*.yml" -o -name "*.yaml")

rm expanded.tmp
2 changes: 1 addition & 1 deletion .github/workflows/build_documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: hatch run docs:build

- name: Link Checker
uses: lycheeverse/lychee-action@v2.1.0
uses: lycheeverse/lychee-action@v2.2.0
with:
args: --config='./.lychee.toml' --no-progress './docs/build/html/**/*.html'
fail: true # fail on broken links
2 changes: 1 addition & 1 deletion .github/workflows/dependabot_amend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
hatch -e test run true
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v5.0.1
uses: stefanzweifel/git-auto-commit-action@v5.1.0
with:
commit_message: "[dependabot skip] :wrench: Update Python requirements files"
branch: ${{ github.head_ref }}
10 changes: 1 addition & 9 deletions .github/workflows/lint_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,7 @@ jobs:
run: |
npm install -g mustache
- name: Expand mustache templates
shell: bash
run: |
echo '{"array": ["dummy"], "variable": "dummy"}' > .mustache_config.json
for yamlfile in $(find . -name "*.yml" -o -name "*.yaml"); do
sed "s|{{\([/#]\)[^}]*}}|{{\1array}}|g" $yamlfile > expanded.tmp # replace mustache arrays
sed -i "s|{{[^#/].\{1,\}}}|{{variable}}|g" expanded.tmp # replace mustache variables
mustache .mustache_config.json expanded.tmp > $yamlfile # perform mustache expansion overwriting original file
done
rm expanded.tmp
run: .github/scripts/expand_mustache.sh
- name: Lint YAML
uses: karancode/yamllint-github-action@v3.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_code.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
shell: bash
run: npm install -g markdown-link-check
- name: Link Checker
uses: lycheeverse/lychee-action@v2.1.0
uses: lycheeverse/lychee-action@v2.2.0
with:
args: --config='./.lychee.toml' --no-progress --offline '**/*.md' --exclude-path './docs'
fail: true # fail on broken links
2 changes: 1 addition & 1 deletion .github/workflows/update_docker_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Create pull request
if: ${{ ! env.ACT }}
id: pull-request
uses: peter-evans/create-pull-request@v7.0.5
uses: peter-evans/create-pull-request@v7.0.6
with:
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
base: develop
Expand Down
Loading

0 comments on commit de563f8

Please sign in to comment.