From ffa48d5370f82d231cf1639c1b9f990746180af3 Mon Sep 17 00:00:00 2001 From: steinhelge Date: Mon, 17 Nov 2025 21:25:39 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Byggel=C3=B8ype=20for=20main=20og=20dev=20i?= =?UTF-8?q?=20samme=20fil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yml | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 08fcf6d..d59e622 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -4,10 +4,19 @@ on: push: branches: - main + - develop + - dev jobs: build-and-push: - runs-on: self-hosted # matcher labelen pĆ„ runneren din + runs-on: self-hosted + + env: + # Denne gir f.eks: + # main ā†’ latest + # develop ā†’ dev + # dev ā†’ dev + TAG: ${{ github.ref_name == 'main' && 'latest' || 'dev' }} steps: - name: Checkout @@ -18,37 +27,37 @@ jobs: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login gitea.theriise.net -u steinhelge --password-stdin # ---------- Frontend ---------- - - name: Build Frontend + - name: Build Frontend (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-frontend:latest \ + -t gitea.theriise.net/steinhelge/minattest-frontend:${TAG} \ -f frontend/minattest-app/Dockerfile \ frontend/minattest-app - - name: Push Frontend + - name: Push Frontend (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-frontend:latest + docker push gitea.theriise.net/steinhelge/minattest-frontend:${TAG} # ---------- Backend API ---------- - - name: Build API + - name: Build API (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-api:latest \ + -t gitea.theriise.net/steinhelge/minattest-api:${TAG} \ -f backend/Dockerfile \ backend - - name: Push API + - name: Push API (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-api:latest + docker push gitea.theriise.net/steinhelge/minattest-api:${TAG} # ---------- App Host / BFF ---------- - - name: Build App Host + - name: Build App Host (${{ env.TAG }}) run: | docker build \ - -t gitea.theriise.net/steinhelge/minattest-app-host:latest \ + -t gitea.theriise.net/steinhelge/minattest-app-host:${TAG} \ -f frontend/minattest-app-host/Dockerfile \ frontend/minattest-app-host - - name: Push App Host + - name: Push App Host (${{ env.TAG }}) run: | - docker push gitea.theriise.net/steinhelge/minattest-app-host:latest + docker push gitea.theriise.net/steinhelge/minattest-app-host:${TAG} From 158bd873e2fe99cca486aa6593484da6f0e9da71 Mon Sep 17 00:00:00 2001 From: steinhelge Date: Mon, 17 Nov 2025 21:27:01 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Endret=209.0.9=20til=209.0.11=20i=20build.y?= =?UTF-8?q?ml=20for=20=C3=A5=20oppdatere=20.NET=20SDK-versjonen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/.config/dotnet-tools.json | 2 +- .../src/MinAttest.Application/MinAttest.Application.csproj | 2 +- .../Migrations/20250913095523_InitialSqlServer.Designer.cs | 2 +- .../20250913104919_AddAttestVerificationCheck.Designer.cs | 2 +- .../20250913112309_EnableTemporalTables.Designer.cs | 2 +- .../Migrations/20250913122233_AddEmployerUser.Designer.cs | 2 +- .../20250913124425_AddAttestContentColumns.Designer.cs | 2 +- .../Data/Migrations/AppDbContextModelSnapshot.cs | 2 +- backend/tests/MinAttest.Tests/MinAttest.Tests.csproj | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/backend/.config/dotnet-tools.json b/backend/.config/dotnet-tools.json index 7cf5ad2..14c1c90 100644 --- a/backend/.config/dotnet-tools.json +++ b/backend/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "9.0.9", + "version": "9.0.11", "commands": [ "dotnet-ef" ], diff --git a/backend/src/MinAttest.Application/MinAttest.Application.csproj b/backend/src/MinAttest.Application/MinAttest.Application.csproj index 44f4d95..5adf1f8 100644 --- a/backend/src/MinAttest.Application/MinAttest.Application.csproj +++ b/backend/src/MinAttest.Application/MinAttest.Application.csproj @@ -8,7 +8,7 @@ - + diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913095523_InitialSqlServer.Designer.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913095523_InitialSqlServer.Designer.cs index 2f632b1..1950b97 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913095523_InitialSqlServer.Designer.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913095523_InitialSqlServer.Designer.cs @@ -20,7 +20,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913104919_AddAttestVerificationCheck.Designer.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913104919_AddAttestVerificationCheck.Designer.cs index 41f5717..75032aa 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913104919_AddAttestVerificationCheck.Designer.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913104919_AddAttestVerificationCheck.Designer.cs @@ -20,7 +20,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913112309_EnableTemporalTables.Designer.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913112309_EnableTemporalTables.Designer.cs index 9446902..3f2cb30 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913112309_EnableTemporalTables.Designer.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913112309_EnableTemporalTables.Designer.cs @@ -20,7 +20,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913122233_AddEmployerUser.Designer.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913122233_AddEmployerUser.Designer.cs index c8bd5d5..d281d0a 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913122233_AddEmployerUser.Designer.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913122233_AddEmployerUser.Designer.cs @@ -20,7 +20,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913124425_AddAttestContentColumns.Designer.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913124425_AddAttestContentColumns.Designer.cs index 42214ee..6ba54e0 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913124425_AddAttestContentColumns.Designer.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/20250913124425_AddAttestContentColumns.Designer.cs @@ -20,7 +20,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/src/MinAttest.Infrastructure/Data/Migrations/AppDbContextModelSnapshot.cs b/backend/src/MinAttest.Infrastructure/Data/Migrations/AppDbContextModelSnapshot.cs index b995fc7..89f3d87 100644 --- a/backend/src/MinAttest.Infrastructure/Data/Migrations/AppDbContextModelSnapshot.cs +++ b/backend/src/MinAttest.Infrastructure/Data/Migrations/AppDbContextModelSnapshot.cs @@ -17,7 +17,7 @@ namespace MinAttest.Infrastructure.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "9.0.9") + .HasAnnotation("ProductVersion", "9.0.11") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); diff --git a/backend/tests/MinAttest.Tests/MinAttest.Tests.csproj b/backend/tests/MinAttest.Tests/MinAttest.Tests.csproj index 22dd260..94a0f0a 100644 --- a/backend/tests/MinAttest.Tests/MinAttest.Tests.csproj +++ b/backend/tests/MinAttest.Tests/MinAttest.Tests.csproj @@ -12,9 +12,9 @@ - - - + + +