Skip to content

Commit

Permalink
fix bugs in aarch64 test
Browse files Browse the repository at this point in the history
  • Loading branch information
llh730 committed Aug 15, 2024
1 parent db3afc6 commit a23cead
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 25 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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<project name=\"mi-dev-integral-rel4.git\" path=\"rel4_kernel\" revision=\"${{ github.sha }}\" remote=\"seL4_kernel\" upstream=\"mi_dev\" dest-branch=\"mi_dev\"/>" .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 }}
Expand Down
2 changes: 1 addition & 1 deletion kernel/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
remote = [email protected]:rel4team/rel4_kernel.git
branch = mi_dev
commit = 411e444fc4972e29d71ecf930c717719839ad69c
parent = 125ef39e35169a5284eb76e3838a12d87122bc87
parent = 477cfb1079496a152b237f6b52cc5fab9f501032
method = merge
cmdver = 0.4.9
2 changes: 1 addition & 1 deletion serial-impl/pl011/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
remote = [email protected]:rel4team/serial-impl-pl011.git
branch = mi_dev
commit = 83e073e19e74420a877b7b099e02c7667e6d6244
parent = 92f41c4e2934d707a7dacca8af2a92ee44e6eb5f
parent = 477cfb1079496a152b237f6b52cc5fab9f501032
method = merge
cmdver = 0.4.9
2 changes: 1 addition & 1 deletion serial-impl/sbi/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
remote = [email protected]:rel4team/serial-impl-sbi.git
branch = mi_dev
commit = 4face963815d4a453f47589ced43cdf9068fde7b
parent = 97f0050c5df521e1ee7009d14b820165bf57f2bd
parent = 477cfb1079496a152b237f6b52cc5fab9f501032
method = merge
cmdver = 0.4.9
41 changes: 21 additions & 20 deletions update.sh
Original file line number Diff line number Diff line change
@@ -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=("[email protected]:rel4team/sel4_common.git"
"[email protected]:rel4team/sel4_task.git"
"[email protected]:rel4team/sel4_ipc.git "
"[email protected]:rel4team/sel4_vspace.git"
"[email protected]:rel4team/sel4_cspace.git"
"[email protected]:rel4team/rel4_kernel.git"
"[email protected]:rel4team/driver-collect.git"
"[email protected]:rel4team/serial-impl-pl011.git"
"[email protected]:rel4team/serial-impl-sbi.git"
"[email protected]:rel4team/serial-frame.git"
)
# urls=("[email protected]:rel4team/sel4_common.git"
# "[email protected]:rel4team/sel4_task.git"
# "[email protected]:rel4team/sel4_ipc.git "
# "[email protected]:rel4team/sel4_vspace.git"
# "[email protected]:rel4team/sel4_cspace.git"
# "[email protected]:rel4team/rel4_kernel.git"
# "[email protected]:rel4team/driver-collect.git"
# "[email protected]:rel4team/serial-impl-pl011.git"
# "[email protected]:rel4team/serial-impl-sbi.git"
# "[email protected]: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

0 comments on commit a23cead

Please sign in to comment.