From f77b47af34f47683cbd572b56de72febbdb85c30 Mon Sep 17 00:00:00 2001 From: feycot Date: Fri, 28 Jan 2022 19:20:37 +0500 Subject: [PATCH 01/13] update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 10c23d0..604769b 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,5 @@ $ make release This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet (in Russian)](https://ru.hexlet.io/pages/about?utm_source=github&utm_medium=link&utm_campaign=exercises-action). ## + +See most active contributers on [hexlet-friends](https://friends.hexlet.io/). From f27f11421c73ecea427f72b1fd03a2f0d06ec947 Mon Sep 17 00:00:00 2001 From: Roman Ashikov Date: Thu, 9 Jun 2022 15:39:06 +0700 Subject: [PATCH 02/13] update readme --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 604769b..6a3c24f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Develop -```sh +```bash # setup $ make # run @@ -24,10 +24,10 @@ $ make compose-schema-validate $ make release ``` -## -[![Hexlet Ltd. logo](https://raw.githubusercontent.com/Hexlet/assets/master/images/hexlet_logo128.png)](https://ru.hexlet.io/pages/about?utm_source=github&utm_medium=link&utm_campaign=exercises-action) +--- -This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet (in Russian)](https://ru.hexlet.io/pages/about?utm_source=github&utm_medium=link&utm_campaign=exercises-action). -## +[![Hexlet Ltd. logo](https://raw.githubusercontent.com/Hexlet/assets/master/images/hexlet_logo128.png)](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=exercises-action) -See most active contributers on [hexlet-friends](https://friends.hexlet.io/). +This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=exercises-action). + +See most active contributors on [hexlet-friends](https://friends.hexlet.io/). From b821cab9f03435592e0003cce2c088c30d4729ad Mon Sep 17 00:00:00 2001 From: ssssank Date: Wed, 6 Jul 2022 16:18:27 +0300 Subject: [PATCH 03/13] update readme --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6a3c24f..0069b4c 100644 --- a/README.md +++ b/README.md @@ -6,28 +6,28 @@ ```bash # setup -$ make +make # run -$ make compose +make compose # check -$ make ci-check +make ci-check # run tests -$ make compose-test +make compose-test # run linters and validators -$ make compose-code-lint -$ make compose-description-lint -$ make compose-schema-validate +make compose-code-lint +make compose-description-lint +make compose-schema-validate # release -$ make release +make release ``` --- -[![Hexlet Ltd. logo](https://raw.githubusercontent.com/Hexlet/assets/master/images/hexlet_logo128.png)](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=exercises-action) +[![Hexlet Ltd. logo](https://raw.githubusercontent.com/Hexlet/assets/master/images/hexlet_logo128.png)](https://hexlet.io/?utm_source=github&utm_medium=link&utm_campaign=exercises-action) -This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet](https://hexlet.io?utm_source=github&utm_medium=link&utm_campaign=exercises-action). +This repository is created and maintained by the team and the community of Hexlet, an educational project. [Read more about Hexlet](https://hexlet.io/?utm_source=github&utm_medium=link&utm_campaign=exercises-action). See most active contributors on [hexlet-friends](https://friends.hexlet.io/). From 6dc0efd1097024d8b8c895ae094578bd0993d42e Mon Sep 17 00:00:00 2001 From: Kirill Mokevnin Date: Fri, 8 Dec 2023 15:22:50 -0500 Subject: [PATCH 04/13] add LT Signed-off-by: Kirill Mokevnin --- Makefile | 18 +++++++++--------- action.yml | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 29d5fee..1027bd6 100644 --- a/Makefile +++ b/Makefile @@ -3,32 +3,32 @@ compose-setup: compose-build compose: - docker-compose up + docker compose up compose-bash: - docker-compose run exercises bash + docker compose run exercises bash compose-build: - docker-compose build + docker compose build compose-test: - docker-compose run exercises make test + docker compose run exercises make test compose-code-lint: - docker-compose run exercises make code-lint + docker compose run exercises make code-lint code-lint: @(for i in $$(find modules -type f -name Makefile); do echo "check $$(dirname $$i)"; done) compose-description-lint: - docker-compose run exercises make description-lint + docker compose run exercises make description-lint compose-schema-validate: - docker-compose run exercises make schema-validate + docker compose run exercises make schema-validate ci-check: - docker-compose --file docker-compose.yml build - docker-compose --file docker-compose.yml up --abort-on-container-exit + docker compose --file docker-compose.yml build + docker compose --file docker-compose.yml up --abort-on-container-exit release: git push -f origin main:release diff --git a/action.yml b/action.yml index ce65fe0..62de87f 100644 --- a/action.yml +++ b/action.yml @@ -35,7 +35,7 @@ runs: shell: bash - name: Build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: cache-from: ${{ env.IMAGE_NAME }}:cached cache-to: type=inline @@ -48,7 +48,7 @@ runs: run: docker push ${{ env.IMAGE_NAME }}:cached shell: bash - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Check run: docker-compose --file docker-compose.yml up --abort-on-container-exit @@ -58,3 +58,13 @@ runs: if: ${{ github.event_name == 'push' }} run: docker push ${{ env.IMAGE_NAME }}:latest shell: bash + + - uses: reviewdog/action-languagetool@v1 + with: + # github_token: ${{ secrets.github_token }} + # Change reviewdog reporter if you need [github-pr-check,github-check,github-pr-review]. + reporter: github-pr-review + language: + default: 'ru-RU' + # Change reporter level if you need. + level: info From 11a43c3f6b090460e7be2b2d2a62689c2ba48d76 Mon Sep 17 00:00:00 2001 From: Kirill Mokevnin Date: Fri, 8 Dec 2023 15:24:12 -0500 Subject: [PATCH 05/13] fix action Signed-off-by: Kirill Mokevnin --- action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 62de87f..1f0abcd 100644 --- a/action.yml +++ b/action.yml @@ -64,7 +64,7 @@ runs: # github_token: ${{ secrets.github_token }} # Change reviewdog reporter if you need [github-pr-check,github-check,github-pr-review]. reporter: github-pr-review - language: - default: 'ru-RU' + # language: + # default: 'ru-RU' # Change reporter level if you need. level: info From 63725fb4cc109025205a0296395de8c28c3def44 Mon Sep 17 00:00:00 2001 From: Kirill Mokevnin Date: Fri, 8 Dec 2023 15:27:11 -0500 Subject: [PATCH 06/13] fix action Signed-off-by: Kirill Mokevnin --- action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index 1f0abcd..1101727 100644 --- a/action.yml +++ b/action.yml @@ -17,14 +17,14 @@ runs: shell: bash - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: # NOTE: Using a docker driver reduces build times. driver: docker - name: Login to Docker Hub if: ${{ github.event_name == 'push' }} - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ inputs.DOCKER_USERNAME }} password: ${{ inputs.DOCKER_PASSWORD }} @@ -63,7 +63,7 @@ runs: with: # github_token: ${{ secrets.github_token }} # Change reviewdog reporter if you need [github-pr-check,github-check,github-pr-review]. - reporter: github-pr-review + reporter: github-check # language: # default: 'ru-RU' # Change reporter level if you need. From 35e168f06fb2ad91637021ac51acb0d26ee8f0ff Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Fri, 7 Jun 2024 15:20:34 +0500 Subject: [PATCH 07/13] update for new structure --- description.ru.yml | 11 +++++++++++ modules/10-basics/10-first-lesson/description.ru.yml | 9 --------- modules/10-basics/10-first-lesson/ru/EXERCISE.md | 1 + modules/10-basics/10-first-lesson/ru/README.md | 1 + modules/10-basics/10-first-lesson/ru/data.yml | 7 +++++++ modules/10-basics/20-second-lesson/description.ru.yml | 9 --------- modules/10-basics/20-second-lesson/ru/EXERCISE.md | 1 + modules/10-basics/20-second-lesson/ru/README.md | 1 + modules/10-basics/20-second-lesson/ru/data.yml | 7 +++++++ spec.yml | 10 ++++++++++ 10 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 description.ru.yml delete mode 100644 modules/10-basics/10-first-lesson/description.ru.yml create mode 100644 modules/10-basics/10-first-lesson/ru/EXERCISE.md create mode 100644 modules/10-basics/10-first-lesson/ru/README.md create mode 100644 modules/10-basics/10-first-lesson/ru/data.yml delete mode 100644 modules/10-basics/20-second-lesson/description.ru.yml create mode 100644 modules/10-basics/20-second-lesson/ru/EXERCISE.md create mode 100644 modules/10-basics/20-second-lesson/ru/README.md create mode 100644 modules/10-basics/20-second-lesson/ru/data.yml create mode 100644 spec.yml diff --git a/description.ru.yml b/description.ru.yml new file mode 100644 index 0000000..9749e10 --- /dev/null +++ b/description.ru.yml @@ -0,0 +1,11 @@ +--- + +title: 'Language' +header: 'Курс JavaScript: обучение JS для начинающих бесплатно' +description: | + Изучение программирования — интересный и захватывающий процесс. +seo_description: | + Начни Javascript онлайн курс бесплатно + +keywords: + - javascript diff --git a/modules/10-basics/10-first-lesson/description.ru.yml b/modules/10-basics/10-first-lesson/description.ru.yml deleted file mode 100644 index 88bce0d..0000000 --- a/modules/10-basics/10-first-lesson/description.ru.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -name: first-lesson - -theory: | - first-lesson theory - -instructions: | - do something diff --git a/modules/10-basics/10-first-lesson/ru/EXERCISE.md b/modules/10-basics/10-first-lesson/ru/EXERCISE.md new file mode 100644 index 0000000..4df2f39 --- /dev/null +++ b/modules/10-basics/10-first-lesson/ru/EXERCISE.md @@ -0,0 +1 @@ +do something diff --git a/modules/10-basics/10-first-lesson/ru/README.md b/modules/10-basics/10-first-lesson/ru/README.md new file mode 100644 index 0000000..ed97b11 --- /dev/null +++ b/modules/10-basics/10-first-lesson/ru/README.md @@ -0,0 +1 @@ +first-lesson theory diff --git a/modules/10-basics/10-first-lesson/ru/data.yml b/modules/10-basics/10-first-lesson/ru/data.yml new file mode 100644 index 0000000..2dd43ea --- /dev/null +++ b/modules/10-basics/10-first-lesson/ru/data.yml @@ -0,0 +1,7 @@ +--- + +name: first-lesson +tips: + - > + [Немного о 'Hello, + World!'](https://ru.hexlet.io/blog/posts/moy-chelovek-menya-ponimaet-istoriya-frazy-hello-world-i-ee-analogov) diff --git a/modules/10-basics/20-second-lesson/description.ru.yml b/modules/10-basics/20-second-lesson/description.ru.yml deleted file mode 100644 index 1635798..0000000 --- a/modules/10-basics/20-second-lesson/description.ru.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -name: second-lesson - -theory: | - second-lesson theory - -instructions: | - do something diff --git a/modules/10-basics/20-second-lesson/ru/EXERCISE.md b/modules/10-basics/20-second-lesson/ru/EXERCISE.md new file mode 100644 index 0000000..4df2f39 --- /dev/null +++ b/modules/10-basics/20-second-lesson/ru/EXERCISE.md @@ -0,0 +1 @@ +do something diff --git a/modules/10-basics/20-second-lesson/ru/README.md b/modules/10-basics/20-second-lesson/ru/README.md new file mode 100644 index 0000000..f5ac2fe --- /dev/null +++ b/modules/10-basics/20-second-lesson/ru/README.md @@ -0,0 +1 @@ +second-lesson theory diff --git a/modules/10-basics/20-second-lesson/ru/data.yml b/modules/10-basics/20-second-lesson/ru/data.yml new file mode 100644 index 0000000..fb14d65 --- /dev/null +++ b/modules/10-basics/20-second-lesson/ru/data.yml @@ -0,0 +1,7 @@ +--- + +name: second-lesson +tips: + - > + [Немного о 'Hello, + World!'](https://ru.hexlet.io/blog/posts/moy-chelovek-menya-ponimaet-istoriya-frazy-hello-world-i-ee-analogov) diff --git a/spec.yml b/spec.yml new file mode 100644 index 0000000..1ce1d0a --- /dev/null +++ b/spec.yml @@ -0,0 +1,10 @@ +--- + +language: + docker_image: "hexletbasics/exercises-action" + extension: js + exercise_filename: index.js + exercise_test_filename: test.js + learn_as: first_language + progress: completed + name: JavaScript From 3d169de7aac562720c1572db1a1128c377473845 Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Fri, 7 Jun 2024 19:00:32 +0500 Subject: [PATCH 08/13] fix deprecated warning --- docker-compose.override.yml | 2 -- docker-compose.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f03dd90..735341c 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,5 @@ --- -version: '3' - services: exercises: volumes: diff --git a/docker-compose.yml b/docker-compose.yml index e4c0803..ac87dc6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,5 @@ --- -version: '3' - services: exercises: build: . From 32ff01d2ce554159425b60ceb17a5e350dfdfac0 Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Fri, 7 Jun 2024 20:15:29 +0500 Subject: [PATCH 09/13] trugger build From 88a3980753ff26c9cfc68b1d9724ec06706eb4fc Mon Sep 17 00:00:00 2001 From: Nikolay Gagarinov Date: Fri, 7 Jun 2024 20:23:37 +0500 Subject: [PATCH 10/13] trigger build new image --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5797ad7..85bd878 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM hexletbasics/base-image:latest ENV var1=value1 ENV var2=value2 -ENV var3=value3 WORKDIR /exercises-action From 1cbe2eea14bb2a980ac28526e36554e09febf7ee Mon Sep 17 00:00:00 2001 From: Ivan Gagarinov Date: Fri, 12 Jul 2024 14:21:38 +0500 Subject: [PATCH 11/13] add languagetool --- .github/workflows/check.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/check.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..502e21e --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,22 @@ +name: Languagetool + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + main: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Check + uses: addnab/docker-run-action@v3 + with: + image: hexlet/languagetool-cli:latest + options: -v ${{ github.workspace }}/modules:/content + run: node ./bin/run.js check /content/**/*.md From fea87ad84799289227cdcadd421b6f22e92d60ae Mon Sep 17 00:00:00 2001 From: Ivan Gagarinov Date: Wed, 24 Jul 2024 15:47:38 +0500 Subject: [PATCH 12/13] add spellcheck to action --- .github/workflows/check.yml | 22 ---------------------- action.yml | 7 +++++++ 2 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 .github/workflows/check.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml deleted file mode 100644 index 502e21e..0000000 --- a/.github/workflows/check.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Languagetool - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - main: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Check - uses: addnab/docker-run-action@v3 - with: - image: hexlet/languagetool-cli:latest - options: -v ${{ github.workspace }}/modules:/content - run: node ./bin/run.js check /content/**/*.md diff --git a/action.yml b/action.yml index 1101727..0830995 100644 --- a/action.yml +++ b/action.yml @@ -68,3 +68,10 @@ runs: # default: 'ru-RU' # Change reporter level if you need. level: info + + - name: Spellcheck + uses: addnab/docker-run-action@v3 + with: + image: hexlet/languagetool-cli:latest + options: -v ${{ github.workspace }}/modules:/content + run: node ./bin/run.js check /content/**/*.md From b1c5a60e32be97b9418534dd8b8a598d5a227d5c Mon Sep 17 00:00:00 2001 From: Ivan Gagarinov Date: Wed, 24 Jul 2024 16:17:55 +0500 Subject: [PATCH 13/13] fix spellcheck errors --- modules/10-basics/10-first-lesson/ru/EXERCISE.md | 2 +- modules/10-basics/10-first-lesson/ru/README.md | 2 +- modules/10-basics/20-second-lesson/ru/EXERCISE.md | 2 +- modules/10-basics/20-second-lesson/ru/README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/10-basics/10-first-lesson/ru/EXERCISE.md b/modules/10-basics/10-first-lesson/ru/EXERCISE.md index 4df2f39..ca70b33 100644 --- a/modules/10-basics/10-first-lesson/ru/EXERCISE.md +++ b/modules/10-basics/10-first-lesson/ru/EXERCISE.md @@ -1 +1 @@ -do something +Do something diff --git a/modules/10-basics/10-first-lesson/ru/README.md b/modules/10-basics/10-first-lesson/ru/README.md index ed97b11..05305cc 100644 --- a/modules/10-basics/10-first-lesson/ru/README.md +++ b/modules/10-basics/10-first-lesson/ru/README.md @@ -1 +1 @@ -first-lesson theory +First-lesson theory diff --git a/modules/10-basics/20-second-lesson/ru/EXERCISE.md b/modules/10-basics/20-second-lesson/ru/EXERCISE.md index 4df2f39..ca70b33 100644 --- a/modules/10-basics/20-second-lesson/ru/EXERCISE.md +++ b/modules/10-basics/20-second-lesson/ru/EXERCISE.md @@ -1 +1 @@ -do something +Do something diff --git a/modules/10-basics/20-second-lesson/ru/README.md b/modules/10-basics/20-second-lesson/ru/README.md index f5ac2fe..f6c20a9 100644 --- a/modules/10-basics/20-second-lesson/ru/README.md +++ b/modules/10-basics/20-second-lesson/ru/README.md @@ -1 +1 @@ -second-lesson theory +Second-lesson theory