Skip to content

Commit

Permalink
Merge branch 'main' into fix/js-undefined-type
Browse files Browse the repository at this point in the history
  • Loading branch information
TatianaFokina authored Dec 29, 2023
2 parents e93bf03 + f030cea commit b14d3da
Show file tree
Hide file tree
Showing 79 changed files with 2,189 additions and 585 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/editorconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- id: files
uses: Ana06/get-changed-files@v1.2
uses: Ana06/get-changed-files@v2.2.0
- name: Проверка линтером
run: |
npm install editorconfig-checker --global
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/featured-articles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
featured-articles:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
token: ${{ secrets.DOKA_BOT_ACCESS_TOKEN }}
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Обработка featured-статей
run: |
npm install --global gray-matter
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/frontmatter-lint.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
name: Frontmatter Lint

on:
workflow_run:
workflows:
- "YaSpeller All"
push:
branches:
- main
types:
- completed

jobs:
frontmatter-lint:
Expand All @@ -16,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Проверка линтером меты в main
run: |
echo "Проверка для всех файлов"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-checker-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
link-check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Проверка ссылок в собранном сайте
uses: ruzickap/action-my-broken-link-checker@v2.2.5
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/maintainer-helper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
update-lists:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Формирует список меты файлов
run: |
echo '{"type": "module","dependencies": {"@octokit/core": "^5.0.0","node-fetch": "^3.3.2"}}' > package.json
Expand Down
37 changes: 2 additions & 35 deletions .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- id: files
if: ${{ github.event_name == 'pull_request' }}
uses: Ana06/get-changed-files@v2.2.0
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- id: files
if: ${{ github.event_name == 'pull_request' }}
uses: Ana06/get-changed-files@v2.2.0
Expand Down Expand Up @@ -77,36 +77,3 @@ jobs:
markdown: true
serverRoot: "/home/runner/work/content/content"
linksToSkip: "https?://(localhost|codepen.io)?(:[0-9]+)?/.*"
yaspeller:
name: Орфография
needs:
- link-checker
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- id: files
if: ${{ github.event_name == 'pull_request' }}
uses: Ana06/get-changed-files@v2.2.0
- name: Проверяет правописание
run: |
npm i -g yaspeller
config=.yaspeller.json
file_list=""
echo "Устанавливаю утилиту..."
for changed_file in ${{ steps.files.outputs.added_modified }}; do
if [[ $changed_file == $config ]]; then
echo "Проверяются все файлы..."
yaspeller --only-errors --file-extensions ".md,.html" *
break
elif [[ $changed_file =~ \.(md|html)$ ]]; then
file_list="${file_list} ${changed_file}"
echo "Файл ${changed_file} добавлен в список для проверки."
fi
done
if ! [[ $file_list == "" ]]; then
echo "Проверяются файлы из PR..."
yaspeller --only-errors ${file_list}
fi
2 changes: 1 addition & 1 deletion .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ярлыки
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Устанавливает необходимые ярлыки
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ jobs:
PATH_TO_CONTENT: ./content
steps:
- name: Загрузка platform
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: doka-guide/platform
- name: Загрузка контента
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
path: content
- name: Загрузка кеша
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: doka-guide/cache
path: cache
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Кэширование модулей
uses: actions/cache@v3
env:
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/product-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@ jobs:
PATH_TO_CONTENT: ./content
steps:
- name: Загрузка platform
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: doka-guide/platform
- name: Загрузка контента
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: content
- uses: actions/setup-node@v2
- name: Загрузка кеша
uses: actions/checkout@v4
with:
node-version: 16
repository: doka-guide/cache
path: cache
- uses: actions/setup-node@v4
with:
node-version: 20
- name: Кэширование модулей
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
Expand All @@ -49,6 +54,8 @@ jobs:
ssh -o StrictHostKeyChecking=no deploy@dev.doka.guide
- name: Установка модулей
run: npm ci
- name: Копирование кеша
run: cp -r ./cache/.cache ./
- name: Сборка сайта
run: |
cp .env.example .env
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/social-cards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Загрузка platform
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: doka-guide/platform
- name: Загрузка контента
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: content
- name: Кэширование модулей
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/sort-dictionary.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/update-dates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
update-dates:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
token: ${{ secrets.DOKA_BOT_ACCESS_TOKEN }}
fetch-depth: 2
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Правка полей updatedAt и createdAt
run: node .github/scripts/update-dates.js
- name: Создание коммита с обновлениями полей
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update Index
on:
workflow_run:
workflows:
- "YaSpeller All"
- "Update Dates"
branches:
- main
types:
Expand All @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
- name: Установка ключа для пользователя
run: |
set -eu
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/yaspeller-all.yml

This file was deleted.

Loading

0 comments on commit b14d3da

Please sign in to comment.