diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2f4d811..37ed489 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -64,9 +64,12 @@ jobs: - name: Install qemu run: apt update && apt -y install qemu-system-misc qemu-system-aarch64 - name: Clone Menifest && Sync repositories - run: repo init -u https://github.com/rel4team/sel4test-manifest.git -b ci-test && repo sync + run: | + repo init -u https://github.com/rel4team/sel4test-manifest.git -b ci-test + sed -i "19c\ \t" .repo/manifests/default.xml + repo sync - run: cd kernel && git checkout mi_dev - - run: cd rel4_kernel && git checkout ${{ github.sha }} + # - run: cd rel4_kernel && git checkout mi_dev - name: Build env: ARCH: ${{ matrix.arch }} diff --git a/kernel/.gitrepo b/kernel/.gitrepo index 4859edc..08004b7 100644 --- a/kernel/.gitrepo +++ b/kernel/.gitrepo @@ -7,6 +7,6 @@ remote = git@github.com:rel4team/rel4_kernel.git branch = mi_dev commit = 411e444fc4972e29d71ecf930c717719839ad69c - parent = 125ef39e35169a5284eb76e3838a12d87122bc87 + parent = 477cfb1079496a152b237f6b52cc5fab9f501032 method = merge cmdver = 0.4.9 diff --git a/serial-impl/pl011/.gitrepo b/serial-impl/pl011/.gitrepo index d62bb2a..6c5e611 100644 --- a/serial-impl/pl011/.gitrepo +++ b/serial-impl/pl011/.gitrepo @@ -7,6 +7,6 @@ remote = git@github.com:rel4team/serial-impl-pl011.git branch = mi_dev commit = 83e073e19e74420a877b7b099e02c7667e6d6244 - parent = 92f41c4e2934d707a7dacca8af2a92ee44e6eb5f + parent = 477cfb1079496a152b237f6b52cc5fab9f501032 method = merge cmdver = 0.4.9 diff --git a/serial-impl/sbi/.gitrepo b/serial-impl/sbi/.gitrepo index 6c86b03..c5e5628 100644 --- a/serial-impl/sbi/.gitrepo +++ b/serial-impl/sbi/.gitrepo @@ -7,6 +7,6 @@ remote = git@github.com:rel4team/serial-impl-sbi.git branch = mi_dev commit = 4face963815d4a453f47589ced43cdf9068fde7b - parent = 97f0050c5df521e1ee7009d14b820165bf57f2bd + parent = 477cfb1079496a152b237f6b52cc5fab9f501032 method = merge cmdver = 0.4.9 diff --git a/update.sh b/update.sh index 6bc3e06..fa4eebb 100755 --- a/update.sh +++ b/update.sh @@ -1,30 +1,31 @@ #!/bin/bash -REPOs=(sel4_common sel4_task sel4_ipc sel4_vspace sel4_cspace rel4_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 cd .. -urls=("git@github.com:rel4team/sel4_common.git" - "git@github.com:rel4team/sel4_task.git" - "git@github.com:rel4team/sel4_ipc.git " - "git@github.com:rel4team/sel4_vspace.git" - "git@github.com:rel4team/sel4_cspace.git" - "git@github.com:rel4team/rel4_kernel.git" - "git@github.com:rel4team/driver-collect.git" - "git@github.com:rel4team/serial-impl-pl011.git" - "git@github.com:rel4team/serial-impl-sbi.git" - "git@github.com:rel4team/serial-frame.git" -) +# urls=("git@github.com:rel4team/sel4_common.git" +# "git@github.com:rel4team/sel4_task.git" +# "git@github.com:rel4team/sel4_ipc.git " +# "git@github.com:rel4team/sel4_vspace.git" +# "git@github.com:rel4team/sel4_cspace.git" +# "git@github.com:rel4team/rel4_kernel.git" +# "git@github.com:rel4team/driver-collect.git" +# "git@github.com:rel4team/serial-impl-pl011.git" +# "git@github.com:rel4team/serial-impl-sbi.git" +# "git@github.com:rel4team/serial-frame.git" +# ) -for url in ${urls[@]}; do - git clone $url -done +# for url in ${urls[@]}; do +# git clone $url +# done for repo in ${REPOs[@]}; do - cd $repo - COMMIT_ID=$(git log -1 --pretty=%H | head -n 1) - echo $COMMIT_ID - cd ../mi-dev-integral-rel4/$repo + # cd $repo + # COMMIT_ID=$(git log -1 --pretty=%H | head -n 1) + # echo $COMMIT_ID + PWD=$(pwd) + cd mi-dev-integral-rel4/$repo sed -i "10c\ \tparent = $PARENT_COMMIT_ID" .gitrepo - cd ../../ + cd $PWD done