Merge pull request #15 from corsicanec82/develop

update config, workflow, readme

.github/workflows/Docker.yml

@@ -2,46 +2,18 @@ name: Docker
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
   pull_request:
-    branches: [ main ]
-
-env:
-  # TODO: Change variable to your registry.
-  REGISTRY_NAME: hexletbasics
+    branches:
+      - main
 
 jobs:
-  build-test:
+  main:
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run tests
-        run: |
-          docker-compose --file docker-compose.test.yml build
-          docker-compose --file docker-compose.test.yml run sut
 
-  build-push-notify:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    needs: build-test
     steps:
-      - uses: actions/checkout@v2
-      - name: Set repository name
-        run: |
-          echo "REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}')" >> $GITHUB_ENV
-      - name: Build and push into docker hub
-        uses: docker/build-push-action@v1.1.0
+      - uses: hexlet-basics/exercises-action@release
         with:
-          repository: ${{ env.REGISTRY_NAME }}/${{ env.REPOSITORY_NAME }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: latest
-      - name: Set fail Slack env vars
-        if: ${{ failure() }}
-        run: |
-          echo "SLACK_COLOR=#a30200" >> $GITHUB_ENV
-      - name: Send notification into Slack
-        if: ${{ always() }}
-        uses: rtCamp/action-slack-notify@v2.0.0
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

Makefile

@@ -8,6 +8,7 @@ compose:
 compose-build:
 	docker-compose build
 
+# TODO: добавить линтер
 code-lint:
 	# ~/bin/jb inspectcode Program.csproj
 
@@ -19,3 +20,16 @@ compose-bash:
 
 compose-test:
 	docker-compose run exercises make test
+
+compose-code-lint:
+	docker-compose run exercises make code-lint
+
+compose-description-lint:
+	docker-compose run exercises make description-lint
+
+compose-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

README.md

@@ -1,4 +1,4 @@
-# hexlet-basics
+# exercises-csharp
 
 [![Github Actions Status](../../workflows/Docker/badge.svg)](../../actions)
 
@@ -13,6 +13,8 @@
 $ make
 # run
 $ make compose
+# check
+$ make ci-check
 
 # run tests
 $ make compose-test
@@ -24,7 +26,9 @@ $ make compose-schema-validate
 ```
 
 ##
-[![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-javascript)
+[![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-csharp)
 
-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-javascript).
+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-csharp).
 ##
+
+See most active contributers on [hexlet-friends](https://friends.hexlet.io/).

docker-compose.override.yml

@@ -0,0 +1,8 @@
+---
+
+version: '3'
+
+services:
+  exercises:
+    volumes:
+      - .:/exercises-csharp

docker-compose.yml

@@ -1,10 +1,9 @@
 ---
 
-version: '3.7'
+version: '3'
 
 services:
   exercises:
     build: .
-    volumes:
-      - .:/exercises-csharp
+    image: hexletbasics/exercises-csharp:cached
     command: make check