Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
da35ac0a83 |
|||
|
875a020e0d |
|||
|
eb347e6900 |
|||
|
c34941a4b9 |
|||
|
afbefae111 |
4 changed files with 13 additions and 34 deletions
13
.github/workflows/docker-publish-backend.yml
vendored
13
.github/workflows/docker-publish-backend.yml
vendored
|
|
@ -9,7 +9,6 @@ on:
|
||||||
jobs:
|
jobs:
|
||||||
production-deploy:
|
production-deploy:
|
||||||
runs-on: ubuntu-26.04
|
runs-on: ubuntu-26.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# 1. Récupération du code
|
# 1. Récupération du code
|
||||||
- name: Check out the repo
|
- name: Check out the repo
|
||||||
|
|
@ -32,7 +31,17 @@ jobs:
|
||||||
- name: Workloads restore
|
- name: Workloads restore
|
||||||
run: dotnet workload restore
|
run: dotnet workload restore
|
||||||
- name: Test
|
- name: Test
|
||||||
run: dotnet test --report-xunit --report-xunit-html --results-directory "test-reports"
|
env:
|
||||||
|
TEST_FAILED: ""
|
||||||
|
run: make test || export TEST_FAILED=$?
|
||||||
|
- uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: my-artifact
|
||||||
|
path: test-reports/**/*
|
||||||
|
- name: Fail if tests failed
|
||||||
|
if: ${{ env.TEST_FAILED != '' && env.TEST_FAILED != '0' }}
|
||||||
|
run: exit $TEST_FAILED
|
||||||
|
|
||||||
# 4. Build et Push de l'image de production finale
|
# 4. Build et Push de l'image de production finale
|
||||||
- name: Build and push production image
|
- name: Build and push production image
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v7
|
||||||
|
|
|
||||||
|
|
@ -1,36 +1,12 @@
|
||||||
# Utilisation de l'image globale pour le build et l'exécution
|
# Utilisation de l'image globale pour le build et l'exécution
|
||||||
FROM pazof/yavsc-build-env:debian12-dotnet10-android36-v1 AS build-env
|
FROM pazof/yavsc-build-env:debian13-dotnet10-android36-jdk21-v4 AS build-env
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
|
|
||||||
# 1. Copie de la solution
|
# 1. Copie de la solution
|
||||||
COPY *.sln ./
|
|
||||||
COPY Directory.*.props ./
|
|
||||||
|
|
||||||
# 2. Copie de l'intégralité des fichiers de projets (.csproj) pour la restauration
|
|
||||||
COPY src/Yavsc.Org/*.csproj ./src/Yavsc.Org/
|
|
||||||
COPY src/Yavsc.Abstract/*.csproj ./src/Yavsc.Abstract/
|
|
||||||
COPY src/Yavsc.Server/*.csproj ./src/Yavsc.Server/
|
|
||||||
COPY src/Yavsc.Api/*.csproj ./src/Yavsc.Api/
|
|
||||||
COPY src/Yavsc.Blogs/*.csproj ./src/Yavsc.Blogs/
|
|
||||||
COPY src/cli/*.csproj ./src/cli/
|
|
||||||
COPY src/Yavsc.Org.Tests/*.csproj ./src/Yavsc.Org.Tests/
|
|
||||||
|
|
||||||
# Projets associés à PostIt
|
|
||||||
COPY src/PostIt/PostIt/*.csproj ./src/PostIt/PostIt/
|
|
||||||
COPY src/PostIt/PostIt.Android/*.csproj ./src/PostIt/PostIt.Android/
|
|
||||||
COPY src/PostIt/PostIt.Browser/*.csproj ./src/PostIt/PostIt.Browser/
|
|
||||||
COPY src/PostIt/PostIt.Desktop/*.csproj ./src/PostIt/PostIt.Desktop/
|
|
||||||
|
|
||||||
# 4. Copie de l'intégralité du code source
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
RUN dotnet workload restore
|
||||||
# 4. Restauration des dépendances pour tous les projets
|
# 4. Restauration des dépendances pour tous les projets
|
||||||
RUN dotnet restore
|
RUN dotnet restore
|
||||||
|
|
||||||
# 5. Copie de la totalité du code source (filtrée par votre .dockerignore)
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
# 6. Compilation du serveur Web principal
|
# 6. Compilation du serveur Web principal
|
||||||
RUN dotnet build src/Yavsc.Org/Yavsc.Org.csproj -c Release --no-restore -clp:ErrorsOnly
|
RUN dotnet build src/Yavsc.Org/Yavsc.Org.csproj -c Release --no-restore -clp:ErrorsOnly
|
||||||
|
|
||||||
|
|
|
||||||
2
Makefile
2
Makefile
|
|
@ -5,8 +5,6 @@ DESTDIR=/tmp/yavsc
|
||||||
APP_PATH=srv/www/yavsc
|
APP_PATH=srv/www/yavsc
|
||||||
APP_FULL_PATH=$(DESTDIR)/$(APP_PATH)
|
APP_FULL_PATH=$(DESTDIR)/$(APP_PATH)
|
||||||
|
|
||||||
include .env
|
|
||||||
|
|
||||||
all:
|
all:
|
||||||
dotnet build --nologo
|
dotnet build --nologo
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,10 +44,6 @@ public partial class App : Application, ILiveView, IVMPusherApp
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
AvaloniaXamlLoader.Load(this);
|
AvaloniaXamlLoader.Load(this);
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
this.AttachDeveloperTools();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnFrameworkInitializationCompleted()
|
public override void OnFrameworkInitializationCompleted()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue