Skip to content

Commit

Permalink
Fix (#199)
Browse files Browse the repository at this point in the history
## Изменения
<!-- Опишите здесь на языке, понятном каждому, изменения, сделанные в
исходном коде по пунктам. -->

## Детали реализации
<!-- Здесь можно описать технические детали по пунктам. -->

## Check-List
<!-- После сохранения у следующих полей появятся галочки, которые нужно
проставить мышкой -->
- [ ] Вы проверили свой код перед отправкой запроса?
- [ ] Вы написали тесты к реализованным функциям?
- [ ] Вы не забыли применить форматирование `black` и `isort` для
_Back-End_ или `Prettier` для _Front-End_?

---------

Co-authored-by: Artem Netsvetaev <physphile@vk.com>
  • Loading branch information
physphile and fizfakovets authored Mar 5, 2024
1 parent 4b3d8d3 commit 8d9eda9
Show file tree
Hide file tree
Showing 187 changed files with 9,498 additions and 9,631 deletions.
12 changes: 6 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#editorconfig.org
root = true

[*]
indent_style = tab
indent_size = 2
#editorconfig.org
root = true

[*]
indent_style = tab
indent_size = 2
12 changes: 6 additions & 6 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VITE_CDN_URL=https://cdn.test.profcomff.com
BASE_URL=https://app.test.profcomff.com
VITE_API_URL=https://api.test.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_test_bot
VITE_AUTH_REDIRECT_URL=http://localhost:9000
VITE_CDN_URL=https://cdn.test.profcomff.com
BASE_URL=https://app.test.profcomff.com
VITE_API_URL=https://api.test.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_test_bot
VITE_AUTH_REDIRECT_URL=http://localhost:9000
12 changes: 6 additions & 6 deletions .env.production
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VITE_CDN_URL=https://cdn.profcomff.com
BASE_URL=https://app.profcomff.com
VITE_API_URL=https://api.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_bot
VITE_AUTH_REDIRECT_URL=https://app.profcomff.com
VITE_CDN_URL=https://cdn.profcomff.com
BASE_URL=https://app.profcomff.com
VITE_API_URL=https://api.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_bot
VITE_AUTH_REDIRECT_URL=https://app.profcomff.com
12 changes: 6 additions & 6 deletions .env.testing
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VITE_CDN_URL=https://cdn.test.profcomff.com
BASE_URL=https://app.test.profcomff.com
VITE_API_URL=https://api.test.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_test_bot
VITE_AUTH_REDIRECT_URL=https://app.test.profcomff.com
VITE_CDN_URL=https://cdn.test.profcomff.com
BASE_URL=https://app.test.profcomff.com
VITE_API_URL=https://api.test.profcomff.com
VITE_FEEDBACK_URL=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
VITE_AUTH_TELEGRAM_BOT=com_profcomff_app_test_bot
VITE_AUTH_REDIRECT_URL=https://app.test.profcomff.com
36 changes: 18 additions & 18 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"root": true,
"env": {
"node": true
},
"extends": [
"eslint:recommended",
"plugin:vue/vue3-recommended",
"@vue/typescript/recommended",
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaVersion": 2020
},
"rules": {
"no-duplicate-imports": "error"
}
}
{
"root": true,
"env": {
"node": true
},
"extends": [
"eslint:recommended",
"plugin:vue/vue3-recommended",
"@vue/typescript/recommended",
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaVersion": 2020
},
"rules": {
"no-duplicate-imports": "error"
}
}
224 changes: 105 additions & 119 deletions .github/workflows/main_commit.yml
Original file line number Diff line number Diff line change
@@ -1,119 +1,105 @@
name: Тесты и раскатка в тестовую среду

on:
push:
branches: ['main']

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
test:
name: Проверяем стили
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 7.26.3

- uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'pnpm'

- name: Install
run: pnpm install

- name: Check
run: pnpm lint && pnpm stylelint

test-format:
name: Выполняем тесты
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 7.26.3

- uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'pnpm'

- name: Install
run: pnpm install

- name: Check
run: pnpm test

build-test-image:
name: Собираем тестовый Docker
runs-on: ubuntu-latest
needs:
- test
- test-format
permissions:
contents: read
packages: write

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

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=test,enable=true
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
file: ./deployment/Dockerfile
context: .
push: true
build-args: |
BUILD_MODE=testing
LAUNCH_MODE=testing
APP_VERSION=${{ github.ref_name }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

deploy-test:
name: Раскатываем тестовый Docker
runs-on: [self-hosted, Linux]
needs: build-test-image
environment:
name: Testing
url: https://app.test.profcomff.com/
env:
CONTAINER_NAME: com_profcomff_app_test
permissions:
packages: read
steps:
- name: Run docker container
run: |
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
docker stop ${{ env.CONTAINER_NAME }} || true && docker rm ${{ env.CONTAINER_NAME }} || true
docker run \
--detach \
--restart on-failure:3 \
--network=web \
--name ${{ env.CONTAINER_NAME }} \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
name: Тесты и раскатка в тестовую среду

on:
push:
branches: ['main']

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
test:
name: Проверяем стили
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1

- name: Install
run: bun install

- name: Check
run: bun run check

test-format:
name: Выполняем тесты
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1

- name: Install
run: bun install

- name: Check
run: bun test

build-test-image:
name: Собираем тестовый Docker
runs-on: ubuntu-latest
needs:
- test
- test-format
permissions:
contents: read
packages: write

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

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=test,enable=true
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
file: ./deployment/Dockerfile
context: .
push: true
build-args: |
BUILD_MODE=testing
LAUNCH_MODE=testing
APP_VERSION=${{ github.ref_name }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

deploy-test:
name: Раскатываем тестовый Docker
runs-on: [self-hosted, Linux]
needs: build-test-image
environment:
name: Testing
url: https://app.test.profcomff.com/
env:
CONTAINER_NAME: com_profcomff_app_test
permissions:
packages: read
steps:
- name: Run docker container
run: |
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
docker stop ${{ env.CONTAINER_NAME }} || true && docker rm ${{ env.CONTAINER_NAME }} || true
docker run \
--detach \
--restart on-failure:3 \
--network=web \
--name ${{ env.CONTAINER_NAME }} \
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test
Loading

0 comments on commit 8d9eda9

Please sign in to comment.