From 5833c0963e6c3ecbaba0feb510782574a1322569 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:37:50 +0200 Subject: [PATCH 01/19] Create dotnet.yml Build test for the GUI app --- .github/workflows/dotnet.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/dotnet.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 0000000..4238659 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,29 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --no-restore + working-directory: ./DDS_D3DTX_Converter_GUI + - name: Test + run: dotnet test --no-build --verbosity normal From b2b6fc6458a710358fc1cfbf879890c162ac71da Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:40:19 +0200 Subject: [PATCH 02/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 4238659..ba2dbab 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -24,6 +24,6 @@ jobs: run: dotnet restore - name: Build run: dotnet build --no-restore - working-directory: ./DDS_D3DTX_Converter_GUI + working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI - name: Test run: dotnet test --no-build --verbosity normal From 5164dd0779fc8a430724a2a530e2c32b2b1fa0cd Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:44:36 +0200 Subject: [PATCH 03/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ba2dbab..daa6cfc 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -24,6 +24,6 @@ jobs: run: dotnet restore - name: Build run: dotnet build --no-restore - working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI - name: Test run: dotnet test --no-build --verbosity normal From d80ceb7d8e3b267d892824fd6e4c7c70b81ee92b Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:50:13 +0200 Subject: [PATCH 04/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index daa6cfc..edf738b 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -24,6 +24,6 @@ jobs: run: dotnet restore - name: Build run: dotnet build --no-restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter - name: Test run: dotnet test --no-build --verbosity normal From d36677435e1e0289a16bc236f9cbfa82157cae5b Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:51:50 +0200 Subject: [PATCH 05/19] Update dotnet.yml Hopefully for the last time --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index edf738b..a1e380c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -24,6 +24,6 @@ jobs: run: dotnet restore - name: Build run: dotnet build --no-restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj - name: Test run: dotnet test --no-build --verbosity normal From 295e372165bf7656b7a95e512cfafc0ab8287ed0 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:53:25 +0200 Subject: [PATCH 06/19] Update dotnet.yml Apparently not --- .github/workflows/dotnet.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a1e380c..8aae59d 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,6 +22,7 @@ jobs: dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj - name: Build run: dotnet build --no-restore working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj From 96dd78c379548b5c7ebe405a5d5cfbe18349ec8b Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:56:46 +0200 Subject: [PATCH 07/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 8aae59d..1ad95c2 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,9 +22,9 @@ jobs: dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter - name: Build run: dotnet build --no-restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter - name: Test run: dotnet test --no-build --verbosity normal From 3ae47ef6fbf7d0764c9c357653a77c45a835a028 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 15:59:45 +0200 Subject: [PATCH 08/19] Update dotnet.yml Round 8 --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1ad95c2..ed8eb2f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,9 +22,9 @@ jobs: dotnet-version: 8.0.x - name: Restore dependencies run: dotnet restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/ - name: Build run: dotnet build --no-restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter + working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/ - name: Test run: dotnet test --no-build --verbosity normal From 33e6da0fbf720d0867b0fdd92aa9c3c2dd6d52dd Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 16:13:56 +0200 Subject: [PATCH 09/19] Update dotnet.yml Round 9 --- .github/workflows/dotnet.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index ed8eb2f..f802a34 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -21,10 +21,10 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/ + run: dotnet restore + working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter - name: Build - run: dotnet build --no-restore - working-directory: ./DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/ + run: dotnet build --configuration Release --no-restore + working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter - name: Test run: dotnet test --no-build --verbosity normal From 47d8ce38232e82036406bd5d83e23a6820063d32 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 16:28:24 +0200 Subject: [PATCH 10/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f802a34..abf25d4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -8,6 +8,9 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] + +env: + GUI_PROJECT_PATH : 'DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj' jobs: build: @@ -21,10 +24,8 @@ jobs: with: dotnet-version: 8.0.x - name: Restore dependencies - run: dotnet restore - working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter + run: dotnet restore ${{env.GUI_PROJECT_PATH}} - name: Build - run: dotnet build --configuration Release --no-restore - working-directory: DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter + run: dotnet build ${{env.GUI_PROJECT_PATH}} --configuration Release --no-restore - name: Test - run: dotnet test --no-build --verbosity normal + run: dotnet test ${{env.GUI_PROJECT_PATH}} --no-build --verbosity normal From efb4a4baeb58388528c2084a5baddb50558481bc Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 16:29:56 +0200 Subject: [PATCH 11/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index abf25d4..38ef4a9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -10,7 +10,7 @@ on: branches: [ "main" ] env: - GUI_PROJECT_PATH : 'DDS-D3DTX-Converter/DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj' + GUI_PROJECT_PATH : 'DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj' jobs: build: From 32081f78f12fc3a45caafbb636f77d097f7f07c7 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 16:58:56 +0200 Subject: [PATCH 12/19] Update dotnet.yml Test if auto build would work --- .github/workflows/dotnet.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 38ef4a9..91a7d43 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -11,6 +11,7 @@ on: env: GUI_PROJECT_PATH : 'DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/DDS_D3DTX_Converter.csproj' + OUTPUT_PROJECT_PATH : 'Builds' jobs: build: @@ -29,3 +30,12 @@ jobs: run: dotnet build ${{env.GUI_PROJECT_PATH}} --configuration Release --no-restore - name: Test run: dotnet test ${{env.GUI_PROJECT_PATH}} --no-build --verbosity normal + - name: Publish + run: dotnet publish ${{env.GUI_PROJECT_PATH}} --configuration Release --no-build + - name: Zip + run: zip -r DDS_D3DTX_Converter.zip ./my_project/bin/Release/net8.0/publish/ + - name: Upload build artifact + uses: actions/upload-artifact@v2 + with: + name: DDS_D3DTX_Converter + path: Builds/DDS_D3DTX_Converter.zip From 0b41e66900a022a8d86a8072f49768fae90a62ae Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:02:11 +0200 Subject: [PATCH 13/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 91a7d43..5ae972a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -33,7 +33,7 @@ jobs: - name: Publish run: dotnet publish ${{env.GUI_PROJECT_PATH}} --configuration Release --no-build - name: Zip - run: zip -r DDS_D3DTX_Converter.zip ./my_project/bin/Release/net8.0/publish/ + run: zip -r DDS_D3DTX_Converter.zip ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/ - name: Upload build artifact uses: actions/upload-artifact@v2 with: From d3a4dbc0075eca67867213a53939337c1481ab57 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:19:19 +0200 Subject: [PATCH 14/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5ae972a..26af625 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -38,4 +38,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: DDS_D3DTX_Converter - path: Builds/DDS_D3DTX_Converter.zip + path: DDS_D3DTX_Converter.zip From 087333f7fc27654c53590cc8f108a057e3870d7c Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:27:32 +0200 Subject: [PATCH 15/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 26af625..a494635 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -38,4 +38,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: DDS_D3DTX_Converter - path: DDS_D3DTX_Converter.zip + path: ./Builds/DDS_D3DTX_Converter.zip From 7620a3c3426fb4279036a24eff965b7a8e30ee6c Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:31:53 +0200 Subject: [PATCH 16/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index a494635..5ae972a 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -38,4 +38,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: DDS_D3DTX_Converter - path: ./Builds/DDS_D3DTX_Converter.zip + path: Builds/DDS_D3DTX_Converter.zip From 88e7e032f1cf0fc2715815b0b988da8f0a601e07 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:44:19 +0200 Subject: [PATCH 17/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5ae972a..6784334 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -35,7 +35,7 @@ jobs: - name: Zip run: zip -r DDS_D3DTX_Converter.zip ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/ - name: Upload build artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: DDS_D3DTX_Converter - path: Builds/DDS_D3DTX_Converter.zip + path: ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/DDS_D3DTX_Converter.zip From b9559a84320698aed38c02cb10b21412b6504622 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:49:51 +0200 Subject: [PATCH 18/19] Update dotnet.yml --- .github/workflows/dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 6784334..f4e6e67 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -37,5 +37,5 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: DDS_D3DTX_Converter - path: ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/DDS_D3DTX_Converter.zip + name: DDS_D3DTX_Converter.zip + path: ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/ From d07ffaca7420d078b76ba1e84f92b8d7285fdae4 Mon Sep 17 00:00:00 2001 From: Ivan Panayotov Date: Tue, 19 Mar 2024 17:53:47 +0200 Subject: [PATCH 19/19] Update dotnet.yml Final update for now --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index f4e6e67..cf0d694 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -37,5 +37,5 @@ jobs: - name: Upload build artifact uses: actions/upload-artifact@v4 with: - name: DDS_D3DTX_Converter.zip + name: DDS_D3DTX_Converter path: ./DDS_D3DTX_Converter_GUI/DDS_D3DTX_Converter/bin/Release/net8.0/publish/