From 9c2e652b2354d4bc18dad38e443f203e78cf9942 Mon Sep 17 00:00:00 2001 From: dam1n19 <dam1n19@soton.ac.uk> Date: Sat, 1 Jul 2023 12:57:09 +0100 Subject: [PATCH] Fixing nanosoc tests --- nanosoc_tech | 2 +- set_env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nanosoc_tech b/nanosoc_tech index 83a969e..7460715 160000 --- a/nanosoc_tech +++ b/nanosoc_tech @@ -1 +1 @@ -Subproject commit 83a969ece065c95c2d1040df64a3f1677867e631 +Subproject commit 7460715838bc5ec7f7c3c38bda18f4bfecd3f5f6 diff --git a/set_env.sh b/set_env.sh index 8304f5c..9bc6d64 100755 --- a/set_env.sh +++ b/set_env.sh @@ -64,7 +64,7 @@ if [ ! -f $SOCLABS_PROJECT_DIR/.socinit ]; then # Source environment variables for all submodules cd $SOCLABS_DESIGN_ROOT git submodule update --remote --recursive - git submodule foreach --recursive git checkout main + git submodule foreach --recursive git checkout main # TODO: Bug on this line - need to checkout to correct branch # Read proj-branch file to find out which branch each subrepo needs to be on git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $SOCLABS_PROJECT_DIR/$line && git checkout `grep $line $SOCLABS_PROJECT_DIR/proj-branch | awk '{ print $2 }'` && git pull; done git restore $SOCLABS_DESIGN_ROOT/.gitmodules -- GitLab