From 740db7058d3b3111cafe5cb96cfeae5ddb210d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20Mar=C3=A9chal?= <45510813+JasonMarechal25@users.noreply.github.com> Date: Tue, 25 Jul 2023 14:54:11 +0200 Subject: [PATCH] Fix error when fetching Antares_test submodule (#1456) * add branch to submodule test * Fix submodule not fetch * Try fix CentOS/Oracle --- .github/workflows/centos7.yml | 2 +- .github/workflows/oracle8.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .gitmodules | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 3ea30c8538..38372e86bb 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -36,7 +36,7 @@ jobs: - name: Init submodule run: | - git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests - name: Download & extract precompiled deps at root run: | diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index cd5d079cb2..a4bbbf5922 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -47,7 +47,7 @@ jobs: - name: Init submodule run: | git config --global safe.directory '*' - git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests - name: Install dependencies run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 61eac79158..f47ce06966 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -85,7 +85,7 @@ jobs: - name: Init submodule run: | git submodule update --init src/antares-deps - git submodule update --init src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests - name: Configure push run: | diff --git a/.gitmodules b/.gitmodules index 205d4f99e2..9bee42d242 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,6 +5,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