fix bugs in update subrepo parent commit

rel4team · Aug 15, 2024 · 5de5505 · 5de5505
1 parent 8af6b65
commit 5de5505
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 16 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   test-build:
+    if: ${{ contains(github.event.head_commit.message, 'git subrepo')}}
     runs-on: ubuntu-latest
     container:
       image: trustworthysystems/sel4
@@ -37,6 +38,7 @@ jobs:
       - name: Build Kernel
         run: cd kernel && ninja -C build
   sel4-test:
+    if: ${{ contains(github.event.head_commit.message, 'git subrepo')}}
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/driver-collect/.gitrepo b/driver-collect/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/driver-collect.git
 	branch = mi_dev
 	commit = 3667ef6ab3d6c4831680310e4b8f0947258569ae
-	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/kernel/.gitrepo b/kernel/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/rel4_kernel.git
 	branch = mi_dev
 	commit = 411e444fc4972e29d71ecf930c717719839ad69c
-	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_cspace/.gitrepo b/sel4_cspace/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/sel4_cspace.git
 	branch = mi_dev
 	commit = b21030fb8e8b54881876bd3dc0d4593bd3989cfc
- 	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+ 	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_ipc/.gitrepo b/sel4_ipc/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/sel4_ipc.git
 	branch = mi_dev
 	commit = 8ea75be470034c5dfb6f69259e19bb883dd435d1
- 	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+ 	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/sel4_vspace/.gitrepo b/sel4_vspace/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/sel4_vspace.git
 	branch = mi_dev
 	commit = 1d317b9eb6b16ff5edbe1f63dbb62f62a6b36c7a
-	parent = 1b1ba0b84e34dabf2e7150d1fc6c6a84446e7cac
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-frame/.gitrepo b/serial-frame/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/serial-frame.git
 	branch = mi_dev
 	commit = 84501a7640813af351464cbb915ba1f63a9f68fe
-	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-impl/pl011/.gitrepo b/serial-impl/pl011/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/serial-impl-pl011.git
 	branch = mi_dev
 	commit = 83e073e19e74420a877b7b099e02c7667e6d6244
-	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/serial-impl/sbi/.gitrepo b/serial-impl/sbi/.gitrepo
@@ -7,6 +7,6 @@
 	remote = [email protected]:rel4team/serial-impl-sbi.git
 	branch = mi_dev
 	commit = 4face963815d4a453f47589ced43cdf9068fde7b
-	parent = 477cfb1079496a152b237f6b52cc5fab9f501032
+	parent = 38e1ebcec5ed0c7acf9e3af293282ae763483023
 	method = merge
 	cmdver = 0.4.9
diff --git a/update.sh b/update.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-REPOs=(sel4_common sel4_task sel4_ipc sel4_vspace sel4_cspace kernel driver-collect serial-impl/pl011 serial-impl/sbi serial-frame)
+REPOs=("sel4_common" "sel4_task" "sel4_ipc" "sel4_vspace" "sel4_cspace" "kernel" "driver-collect" serial-impl/pl011 serial-impl/sbi serial-frame)
 PARENT_COMMIT_ID=$(git log -1 --pretty=%H | head -n 1)
 echo $PARENT_COMMIT_ID
 
@@ -20,11 +20,5 @@ echo $PARENT_COMMIT_ID
 # done
 
 for repo in ${REPOs[@]}; do
-    # cd $repo
-    # COMMIT_ID=$(git log -1 --pretty=%H | head -n 1)
-    # echo $COMMIT_ID
-    PWD=$(pwd)
-    cd $repo
-    sed -i "10c\ \tparent = $PARENT_COMMIT_ID" .gitrepo
-    cd $PWD
+    sed -i "10c\ \tparent = $PARENT_COMMIT_ID" $repo/.gitrepo
 done