Some checks are pending
CI / POS (WPF, Windows) (push) Waiting to run
CI / Backend (.NET 8) (push) Successful in 27s
CI / Web (React + Vite) (push) Successful in 23s
Docker Images / API image (push) Successful in 34s
Docker Images / Web image (push) Successful in 27s
Docker Images / Deploy stage (push) Successful in 15s
Main расходился с БД стейджа (Phase2c3_MsStrict в history, но код ещё ссылался на VatRate etc.) — деплой ломался. Реплицирую удаление сущностей вручную, чтобы код совпадал с таблицами. Убрано (нет в MoySklad — не выдумываем): - Domain: VatRate сущность целиком; Counterparty.Kind + enum CounterpartyKind; Store.Kind + enum StoreKind; Product.IsAlcohol; UnitOfMeasure.Symbol/DecimalPlaces/IsBase. - EF: DbSet<VatRate>, ConfigureVatRate, Product.VatRate navigation, индекс Counterparty.Kind. - DTO/Input: соответствующие поля и VatRateDto/Input. - API: VatRatesController удалён; references в Products/Counterparties/Stores/UoM/Supplies/Retail/Stock. Добавлено как в MoySklad: - Product.Vat (int) + Product.VatEnabled — MoySklad держит НДС числом на товаре. - KZ default VAT 16% — applied в сидерах и в MoySkladImportService когда товар не принёс свой vat. MoySkladImportService: - ResolveKind убран; CompanyType=entrepreneur→Individual (как и было). - VatRates lookup → прямой p.Vat ?? 16 + p.Vat > 0 для VatEnabled. - baseUnit ищется по code="796" вместо IsBase. Web: - types.ts: убраны CounterpartyKind/StoreKind/VatRate/Product.vatRateId/vatPercent/isAlcohol/UoM.symbol/decimalPlaces/isBase; добавлено Product.vat/vatEnabled; унифицировано unitSymbol→unitName. - VatRatesPage удалён, роут из App.tsx тоже. - CounterpartiesPage/StoresPage/UnitsOfMeasurePage: убраны соответствующие поля в формах. - ProductEditPage: select "Ставка НДС" теперь с фиксированными 0/10/12/16/20 + чекбокс VatEnabled. - Stock/RetailSale/Supply pages: unitSymbol → unitName. deploy-stage unguarded — теперь код соответствует DB, авто-deploy безопасен.
116 lines
3.3 KiB
YAML
116 lines
3.3 KiB
YAML
name: Docker Images
|
|
|
|
on:
|
|
push:
|
|
branches: [main]
|
|
paths:
|
|
- 'src/food-market.api/**'
|
|
- 'src/food-market.web/**'
|
|
- 'src/food-market.application/**'
|
|
- 'src/food-market.domain/**'
|
|
- 'src/food-market.infrastructure/**'
|
|
- 'src/food-market.shared/**'
|
|
- 'deploy/**'
|
|
- '.forgejo/workflows/docker.yml'
|
|
workflow_dispatch:
|
|
|
|
env:
|
|
LOCAL_REGISTRY: 127.0.0.1:5001
|
|
|
|
jobs:
|
|
api:
|
|
name: API image
|
|
runs-on: [self-hosted, linux]
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
|
|
- name: Build + push api
|
|
env:
|
|
SHA: ${{ github.sha }}
|
|
run: |
|
|
docker build -f deploy/Dockerfile.api \
|
|
-t $LOCAL_REGISTRY/food-market-api:$SHA \
|
|
-t $LOCAL_REGISTRY/food-market-api:latest .
|
|
for tag in $SHA latest; do
|
|
docker push $LOCAL_REGISTRY/food-market-api:$tag
|
|
done
|
|
|
|
web:
|
|
name: Web image
|
|
runs-on: [self-hosted, linux]
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
|
|
- name: Build + push web
|
|
env:
|
|
SHA: ${{ github.sha }}
|
|
run: |
|
|
docker build -f deploy/Dockerfile.web \
|
|
-t $LOCAL_REGISTRY/food-market-web:$SHA \
|
|
-t $LOCAL_REGISTRY/food-market-web:latest .
|
|
for tag in $SHA latest; do
|
|
docker push $LOCAL_REGISTRY/food-market-web:$tag
|
|
done
|
|
|
|
deploy-stage:
|
|
name: Deploy stage
|
|
runs-on: [self-hosted, linux]
|
|
needs: [api, web]
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
|
|
- name: Write .env + copy compose (runner = stage host)
|
|
env:
|
|
SHA: ${{ github.sha }}
|
|
PGPASS: ${{ secrets.STAGE_POSTGRES_PASSWORD }}
|
|
run: |
|
|
cat > /home/nns/food-market-stage/deploy/.env <<ENV
|
|
REGISTRY=127.0.0.1:5001
|
|
API_TAG=$SHA
|
|
WEB_TAG=$SHA
|
|
POSTGRES_PASSWORD=$PGPASS
|
|
ENV
|
|
cp deploy/docker-compose.yml /home/nns/food-market-stage/deploy/docker-compose.yml
|
|
|
|
- name: docker compose pull + up
|
|
working-directory: /home/nns/food-market-stage/deploy
|
|
run: |
|
|
docker compose pull
|
|
docker compose up -d --remove-orphans
|
|
|
|
- name: Smoke /health
|
|
run: |
|
|
for i in 1 2 3 4 5 6; do
|
|
sleep 5
|
|
if curl -fsS http://127.0.0.1:8080/health | grep -q '"status":"ok"'; then
|
|
echo "Health OK"
|
|
exit 0
|
|
fi
|
|
done
|
|
echo "Health failed"
|
|
exit 1
|
|
|
|
- name: Notify Telegram on success
|
|
if: success()
|
|
env:
|
|
BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
|
|
SHA: ${{ github.sha }}
|
|
run: |
|
|
curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
|
|
--data-urlencode "chat_id=$CHAT" \
|
|
--data-urlencode "text=✅ stage deployed — ${SHA:0:7} → https://food-market.zat.kz" \
|
|
> /dev/null
|
|
|
|
- name: Notify Telegram on failure
|
|
if: failure()
|
|
env:
|
|
BOT: ${{ secrets.TELEGRAM_BOT_TOKEN }}
|
|
CHAT: ${{ secrets.TELEGRAM_CHAT_ID }}
|
|
SHA: ${{ github.sha }}
|
|
run: |
|
|
curl -sS -X POST "https://api.telegram.org/bot$BOT/sendMessage" \
|
|
--data-urlencode "chat_id=$CHAT" \
|
|
--data-urlencode "text=❌ stage deploy FAILED — ${SHA:0:7}" \
|
|
> /dev/null
|