Skip to content

Commit

Permalink
Merge branch 'main' into kayma/validate-dictionaries
Browse files Browse the repository at this point in the history
  • Loading branch information
kayman-mk authored Jan 7, 2025
2 parents 16733c5 + 8947e3a commit 0cb43b0
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 49 deletions.
85 changes: 38 additions & 47 deletions .config/cspell.json
Original file line number Diff line number Diff line change
@@ -1,53 +1,44 @@
{
"version": "0.2",
"language": "en",
"words": [
"cpus",
"Hapag",
"Infracost",
"javadoc",
"javadocs",
"oidc",
"Repology",
"sonatype",
"tflint",
"tfsec"
"dictionaries": [
"workflow",
"maven",
"python",
"docker",
"simple",
"terraform-module",
"project"
],
"ignoreWords": [
"Buildx",
"DOCKERHUB",
"amannn",
"aquasecurity",
"automerge",
"automerged",
"buildcache",
"buildx",
"codeowners",
"codeql",
"conventionalcommits",
"datasource",
"dorny",
"hadolint",
"hlag",
"hmarr",
"ibiqlik",
"kayman",
"ludeeus",
"markdownlint",
"mktemp",
"nullglob",
"ossrh",
"pascalfrenz",
"releaserc",
"rhysd",
"ruleset",
"sarif",
"shellcheck",
"shuf",
"shunsuke",
"signoff",
"temurin",
"tfstate",
"vuln"
"dictionaryDefinitions": [
{
"name": "workflow",
"path": "dictionaries/workflow.txt",
"addWords": true
},
{
"name": "maven",
"path": "dictionaries/maven.txt"
},
{
"name": "python",
"path": "dictionaries/python.txt"
},
{
"name": "docker",
"path": "dictionaries/docker.txt"
},
{
"name": "simple",
"path": "dictionaries/simple.txt"
},
{
"name": "terraform-module",
"path": "dictionaries/terraform-module.txt"
},
{
"name": "project",
"path": "dictionaries/project.txt"
}
]
}
Empty file added .config/dictionaries/docker.txt
Empty file.
Empty file added .config/dictionaries/maven.txt
Empty file.
Empty file.
Empty file added .config/dictionaries/python.txt
Empty file.
Empty file added .config/dictionaries/simple.txt
Empty file.
Empty file.
23 changes: 23 additions & 0 deletions .config/dictionaries/workflow.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
amannn
aquasecurity
buildx
codeowners
cpus
dockerhub
dorny
hapag
hlag
hmarr
ibiqlik
ludeeus
nullglob
ossrh
releaserc
rhysd
sarif
shellcheck
shuf
shunsuke
temurin
tflint
tfsec
11 changes: 9 additions & 2 deletions update-workflows.sh → .github/update_workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ This PR updates all workflows to the latest version.
Done by the workflows in this feature branch, except for the release workflow.
EOF
)

gh pr create --title "ci: update workflows to latest version" --body "$body" --base main
gh pr view --web
}
Expand Down Expand Up @@ -129,7 +129,14 @@ shopt -s nullglob
mkdir -p "$destination_path/.github/workflows"
cp .github/workflows/default_* "$destination_path/.github/workflows"

cp -pr .config "$destination_path/"
# move the update-workflows.sh script to the correct location (from older releases)
if [ -f "$destination_path/update-workflows.sh" ]; then
git mv -f "$destination_path/update-workflows.sh" "$destination_path/.github/update_workflows.sh"
fi

cp -p .config "$destination_path/"

setup_cspell

# we do not have special files for simple GitHub projects, this is handled by the default setup
if [ "$repository_type" != "github-only" ]; then
Expand Down

0 comments on commit 0cb43b0

Please sign in to comment.