Skip to content

Commit

Permalink
Merge branch 'main' into next-6.7
Browse files Browse the repository at this point in the history
  • Loading branch information
bojanrajh committed Nov 18, 2024
2 parents 228eab3 + 0eaf423 commit 249aec3
Show file tree
Hide file tree
Showing 57 changed files with 2,967 additions and 1,977 deletions.
1 change: 1 addition & 0 deletions .github/scripts/format-adrs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as path from "https://deno.land/[email protected]/path/mod.ts";
const formattingPromises = [];
for await (const entry of walk("./resources/references/adr")) {
if (entry.isDirectory) continue;
if (!entry.path.endsWith('.md')) continue;
if (path.basename(entry.path).startsWith('_')) continue;
if (path.basename(entry.path) === 'index.md') continue;
if (path.basename(entry.path) === 'README.md') continue;
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/format-code-guidelines.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as path from "https://deno.land/[email protected]/path/mod.ts";
const formattingPromises = [];
for await (const entry of walk("./resources/guidelines/code/core")) {
if (entry.isDirectory) continue;
if (!entry.path.endsWith('.md')) continue;
if (path.basename(entry.path).startsWith('_')) continue;
if (path.basename(entry.path) === 'index.md') continue;
if (path.basename(entry.path) === 'README.md') continue;
Expand All @@ -14,6 +15,10 @@ for await (const entry of walk("./resources/guidelines/code/core")) {
await Promise.allSettled(formattingPromises);

function addHint(buffer, filePath) {
if (filePath.includes('/adr/assets/')) {
return buffer;
}

buffer += '\n';
buffer += '::: info\n';
buffer += 'This document represents core guidelines and has been mirrored from the core in our Shopware 6 repository.\n';
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: rojopolis/spellcheck-github-actions@0.41.0
- uses: rojopolis/spellcheck-github-actions@0.43.0
name: Spellcheck
with:
config_path: .spellcheck.yml
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
.vscode
.vscode
/dictionary.dic
Loading

0 comments on commit 249aec3

Please sign in to comment.