Skip to content

Commit

Permalink
Merge branch 'main' into prepare-markdownlint-update
Browse files Browse the repository at this point in the history
  • Loading branch information
cartermp authored Nov 22, 2023
2 parents 898c688 + 384a9ed commit 916969b
Show file tree
Hide file tree
Showing 39 changed files with 1,276 additions and 220 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-update-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

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

- name: Use CLA approved github bot
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ jobs:
name: FILENAME check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm run check:filenames

check-formatting:
name: FILE FORMAT
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create NPM cache-hash input file
run: |
mkdir -p tmp
jq '{devDependencies, dependencies, engines, gitHubActionCacheKey}' package.json > tmp/package-ci.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: npm
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: BUILD and CHECK LINKS
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create NPM cache-hash input file
run: |
Expand All @@ -24,7 +24,7 @@ jobs:
package.json > tmp/package-min.json
cp tmp/package-min.json package.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: npm
Expand All @@ -46,7 +46,7 @@ jobs:
needs: build-and-check-links
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
with: { name: build-log-etc }
- run: npm run diff:fail
Expand All @@ -56,7 +56,7 @@ jobs:
needs: build-and-check-links
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
with: { name: build-log-etc }
- run: cat tmp/build-log.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: SPELLING check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: streetsidesoftware/cspell-action@v2
with:
# Files should be consistent with check:spelling files
Expand All @@ -22,7 +22,7 @@ jobs:
name: CSPELL:IGNORE check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm run fix:dict
- name: Any changed files?
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: TEXT linter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# Make sure that we only install the dependencies for textlint to speed up install
- run: |
mkdir -p tmp
Expand All @@ -23,7 +23,7 @@ jobs:
name: MARKDOWN linter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create and use reduced-dependencies package.json
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
echo $PR_NUM
echo $COMMENT
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: gh pr checkout $PR_NUM
env:
Expand All @@ -38,7 +38,7 @@ jobs:
mkdir -p tmp
jq '{devDependencies, dependencies, engines, gitHubActionCacheKey}' package.json > tmp/package-ci.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: npm
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
echo $PR_NUM
echo $COMMENT
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: gh pr checkout $PR_NUM
env:
Expand All @@ -95,7 +95,7 @@ jobs:
mkdir -p tmp
jq '{devDependencies, dependencies, engines, gitHubActionCacheKey}' package.json > tmp/package-ci.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: npm
Expand Down
2 changes: 1 addition & 1 deletion .htmltest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CacheExpires: 4400h # ~ 6 months
CacheExpires: 6000h # ~ 8.2 months
DirectoryPath: public
IgnoreDirectoryMissingTrailingSlash: true
IgnoreAltMissing: true
Expand Down
6 changes: 5 additions & 1 deletion .textlintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ filters:
# Hugo template syntax:
- /{{.*?}}/
- /{{%.*?%}}/
# Other
# Custom header anchors in markdown headings:
- /{#.*?}/
# src attribute in figure Hugo template:
- /src=".*?"/
# Other:
- /<https?://.*?>/ # Raw URLs
rules:
terminology:
Expand Down
6 changes: 5 additions & 1 deletion archetypes/blog.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ With contributions from secondary-author-name-1, ..., and secondary-author-n.

## Top-level heading

Top-level headings start at **level 2**, as shown above.
Top-level headings start at **level 2**. This means, that your post should not
include `# headings` for top-level headings but `## headings` instead.

## Paragraphs

Expand All @@ -44,3 +45,6 @@ npm run format
```

Happy writing!

**Note:** If you view this page with the GitHub file viewer, you can safely
ignore the `Error in user YAML` at the top of this page.
8 changes: 0 additions & 8 deletions assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,6 @@ body.td-page--draft .td-content {
}
}

// TODO(@chalin): upstream
.tab-body {
> .highlight:only-child {
margin: -1.5rem;
max-width: calc(100% + 3rem);
}
}

details {
margin-bottom: $paragraph-margin-bottom;
}
Expand Down
Loading

0 comments on commit 916969b

Please sign in to comment.