Merge pull request #3 from hexlet-basics/main

Release

Dockerfile

@@ -2,7 +2,6 @@ FROM hexletbasics/base-image:latest
 
 ENV var1=value1
 ENV var2=value2
-ENV var3=value3
 
 WORKDIR /exercises-action
 

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

README.md

@@ -4,28 +4,30 @@
 
 ## Develop
 
-```sh
+```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://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)
+
+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/).

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 }}
@@ -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,20 @@ 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-check
+        # language:
+        #   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

description.ru.yml

@@ -0,0 +1,11 @@
+---
+
+title: 'Language'
+header: 'Курс JavaScript: обучение JS для начинающих бесплатно'
+description: |
+  Изучение программирования — интересный и захватывающий процесс.
+seo_description: |
+  Начни Javascript онлайн курс бесплатно
+
+keywords:
+  - javascript

docker-compose.override.yml

@@ -1,7 +1,5 @@
 ---
 
-version: '3'
-
 services:
   exercises:
     volumes:

docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: '3'
-
 services:
   exercises:
     build: .

modules/10-basics/10-first-lesson/ru/EXERCISE.md

@@ -0,0 +1 @@
+Do something

modules/10-basics/10-first-lesson/ru/README.md

@@ -0,0 +1 @@
+First-lesson theory

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)

modules/10-basics/20-second-lesson/ru/EXERCISE.md

@@ -0,0 +1 @@
+Do something

modules/10-basics/20-second-lesson/ru/README.md

@@ -0,0 +1 @@
+Second-lesson theory

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)

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