From 50763531e069b01226fb2e1e6338db3cfffee2ed Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Thu, 4 May 2023 10:08:48 +0100
Subject: [PATCH] Updated branch reference to main for nanosoc sub repo and
added a git pull to the set env script
---
nanosoc_tech | 2 +-
proj-branch | 2 +-
set_env.sh | 2 +-
system/README.md | 0
4 files changed, 3 insertions(+), 3 deletions(-)
create mode 100644 system/README.md
diff --git a/nanosoc_tech b/nanosoc_tech
index c04ad57..65ff336 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit c04ad57b008e85421dcb4a0a69b54a54e386c3a7
+Subproject commit 65ff336af970c2b183bb971966ec444c181ccd70
diff --git a/proj-branch b/proj-branch
index 0d1d936..9444c65 100644
--- a/proj-branch
+++ b/proj-branch
@@ -12,7 +12,7 @@
# Project Repository Subrepository Branch Index
# Add your Accelerator Repository here
# accelerator_repo: main
-nanosoc_tech: feat_accel_decouple
+nanosoc_tech: main
chipkit_flow: main
accelerator_wrapper_tech: main
fpga_lib_tech: main
diff --git a/set_env.sh b/set_env.sh
index 102f446..f93060c 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -64,7 +64,7 @@ if [ ! -f $PROJECT_DIR/.socinit ]; then
git submodule update --remote --recursive
git submodule foreach --recursive git checkout main
# 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 $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/proj-branch | awk '{ print $2 }'`; done
+ git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/proj-branch | awk '{ print $2 }'` && git pull; done
git restore $DESIGN_ROOT/.gitmodules
touch $PROJECT_DIR/.socinit
fi
\ No newline at end of file
diff --git a/system/README.md b/system/README.md
new file mode 100644
index 0000000..e69de29
--
GitLab