From 2618c518f6936f4837f55af537bf393731303d00 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 29 Jan 2025 14:09:18 +0100 Subject: [PATCH 1/2] Remove Antares_test submodule --- .gitmodules | 5 +---- src/tests/resources/Antares_Simulator_Tests | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 src/tests/resources/Antares_Simulator_Tests diff --git a/.gitmodules b/.gitmodules index 16639d0fb1..88d0f917bc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,10 +1,7 @@ -[submodule "src/tests/resources/Antares_Simulator_Tests"] - path = src/tests/resources/Antares_Simulator_Tests - url = https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests.git - branch = master [submodule "vcpkg"] path = vcpkg url = https://github.com/microsoft/vcpkg.git [submodule "src/tests/resources/Antares_Simulator_Tests_NR"] path = src/tests/resources/Antares_Simulator_Tests_NR url = https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR.git + branch = main diff --git a/src/tests/resources/Antares_Simulator_Tests b/src/tests/resources/Antares_Simulator_Tests deleted file mode 160000 index 2d79167609..0000000000 --- a/src/tests/resources/Antares_Simulator_Tests +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2d79167609fc15497085aaa7311698adb63222a2 From 980568c54f3409ac1b7e75c08237f09e4fb9d303 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Wed, 29 Jan 2025 14:18:12 +0100 Subject: [PATCH 2/2] Update CI jobs accodingly --- .github/workflows/sonarcloud.yml | 2 +- .github/workflows/ubuntu.yml | 4 ---- .github/workflows/windows-vcpkg.yml | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index e6f1cf608f..39b83be616 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -103,7 +103,7 @@ jobs: - name: Init submodule run: | - git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests_NR - name: Configure run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 47b2932334..bf108a2071 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -142,10 +142,6 @@ jobs: run: | echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV - - name: Init submodule Antares_Simulator_Tests - run: | - git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests - - name: Init submodule Antares_Simulator_Tests_NR run: | git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests_NR diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 5fb4b19603..9ba3565406 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -144,10 +144,6 @@ jobs: run: | echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV - - name: Init submodule Antares_Simulator_Tests - run: | - git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests - - name: Init submodule Antares_Simulator_Tests_NR run: | git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests_NR