zhenxing
/
zCore
forked from rcore-os/zCore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: github ci

This commit is contained in:
workerwork 2022-05-18 18:28:59 +08:00 committed by Zhenxing
parent 3b9b255ec9
commit 6b30fe8b40
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/scripts/install-qemu.sh vendored
View File

@ -1,9 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
wget https://download.qemu.org/qemu-$1.tar.xz wget https://download.qemu.org/qemu-$1.tar.xz
tar -xf qemu-$1.tar.xz tar -xJf qemu-$1.tar.xz
cd qemu-$1 cd qemu-$1
./configure --target-list=x86_64-softmmu,riscv64-softmmu ./configure --target-list=x86_64-softmmu,riscv64-softmmu
make -j make -j$nproc > /dev/null 2>&1
sudo make install
qemu-system-$2 --version

6
.github/workflows/docs.yml vendored
View File

@ -16,13 +16,13 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
- name: Build docs - name: Build docs
run: | run: |
cargo doc --no-deps --all-features cargo doc --no-deps --all-features
../scripts/add_doc_index.sh .github/scripts/add-doc-index.sh
- name: Deploy to Github Pages - name: Deploy to Github Pages
if: ${{ github.ref == 'refs/heads/master' }} if: ${{ github.ref == 'refs/heads/master' }}
uses: JamesIves/github-pages-deploy-action@releases/v3 uses: JamesIves/github-pages-deploy-action@releases/v3

51
.github/workflows/test.yml vendored
View File

@ -20,7 +20,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- name: Pull prebuilt images - name: Pull prebuilt images
@ -69,7 +69,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- name: Run bench test - name: Run bench test
@ -88,7 +88,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- name: Pull prebuilt images - name: Pull prebuilt images
@ -98,7 +98,7 @@ jobs:
git lfs pull -I prebuilt/zircon/x64/userboot-libos.so git lfs pull -I prebuilt/zircon/x64/userboot-libos.so
- name: Install python dependencies - name: Install python dependencies
run: ../scripts/install-deps.sh run: .github/scripts/install-deps.sh
- name: Run fast tests - name: Run fast tests
if: github.event_name != 'schedule' if: github.event_name != 'schedule'
@ -119,14 +119,14 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- name: Pull prebuilt images - name: Pull prebuilt images
run: git lfs pull -I prebuilt/linux/libc-libos.so run: git lfs pull -I prebuilt/linux/libc-libos.so
- name: Install dependencies - name: Install dependencies
run: ../scripts/install-deps.sh musl-tools musl-dev run: .github/scripts/install-deps.sh musl-tools musl-dev
- name: Prepare rootfs - name: Prepare rootfs
run: make libc-test run: make libc-test
@ -154,7 +154,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- name: Pull prebuilt images - name: Pull prebuilt images
@ -164,7 +164,7 @@ jobs:
git lfs pull -I prebuilt/zircon/x64/userboot.so git lfs pull -I prebuilt/zircon/x64/userboot.so
- name: Install dependencies - name: Install dependencies
run: ../scripts/install-python-deps.sh ninja-build run: .github/scripts/install-deps.sh ninja-build
- name: Cache QEMU - name: Cache QEMU
id: cache-qemu id: cache-qemu
@ -173,9 +173,14 @@ jobs:
path: qemu-${{ env.qemu_version }} path: qemu-${{ env.qemu_version }}
key: qemu-${{ env.qemu_version }}-x86_64-riscv64 key: qemu-${{ env.qemu_version }}-x86_64-riscv64
- name: Install QEMU - name: Download and Compile QEMU
if: steps.cache-qemu.outputs.cache-hit != 'true' if: steps.cache-qemu.outputs.cache-hit != 'true'
run: ../scripts/install-qemu.sh ${{ env.qemu_version }} ${{ matrix.arch }} run: .github/scripts/install-qemu.sh ${{ env.qemu_version }}
- name: Install QEMU
run: |
cd qemu-${{ env.qemu_version }} && sudo make install
qemu-system-${{ matrix.arch }} --version
- name: Run fast tests - name: Run fast tests
if: github.event_name != 'schedule' if: github.event_name != 'schedule'
@ -200,7 +205,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- if: matrix.arch == 'riscv64' - if: matrix.arch == 'riscv64'
@ -213,7 +218,7 @@ jobs:
run: git lfs pull -I prebuilt/linux/libc-libos.so run: git lfs pull -I prebuilt/linux/libc-libos.so
- name: Install dependencies - name: Install dependencies
run: ../scripts/install-deps.sh musl-tools musl-dev ninja-build run: .github/scripts/install-deps.sh musl-tools musl-dev ninja-build
- name: Cache QEMU - name: Cache QEMU
id: cache-qemu id: cache-qemu
@ -222,9 +227,14 @@ jobs:
path: qemu-${{ env.qemu_version }} path: qemu-${{ env.qemu_version }}
key: qemu-${{ env.qemu_version }}-x86_64-riscv64 key: qemu-${{ env.qemu_version }}-x86_64-riscv64
- name: Install QEMU - name: Download and Compile QEMU
if: steps.cache-qemu.outputs.cache-hit != 'true' if: steps.cache-qemu.outputs.cache-hit != 'true'
run: ../scripts/install-qemu.sh ${{ env.qemu_version }} ${{ matrix.arch }} run: .github/scripts/install-qemu.sh ${{ env.qemu_version }}
- name: Install QEMU
run: |
cd qemu-${{ env.qemu_version }} && sudo make install
qemu-system-${{ matrix.arch }} --version
- name: Prepare rootfs - name: Prepare rootfs
run: make libc-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }} run: make libc-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }}
@ -252,7 +262,7 @@ jobs:
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
profile: minimal profile: minimal
toolchain: nightly-2022-01-20 toolchain: ${{ env.rust_toolchain }}
components: rust-src, llvm-tools-preview, rustfmt, clippy components: rust-src, llvm-tools-preview, rustfmt, clippy
- if: matrix.arch == 'riscv64' - if: matrix.arch == 'riscv64'
@ -265,7 +275,7 @@ jobs:
run: git lfs pull -I prebuilt/linux/libc-libos.so run: git lfs pull -I prebuilt/linux/libc-libos.so
- name: Install dependencies - name: Install dependencies
run: ../scripts/install-deps.sh musl-tools musl-dev ninja-build run: .github/scripts/install-deps.sh musl-tools musl-dev ninja-build
- name: Cache QEMU - name: Cache QEMU
id: cache-qemu id: cache-qemu
@ -274,9 +284,14 @@ jobs:
path: qemu-${{ env.qemu_version }} path: qemu-${{ env.qemu_version }}
key: qemu-${{ env.qemu_version }}-x86_64-riscv64 key: qemu-${{ env.qemu_version }}-x86_64-riscv64
- name: Install QEMU - name: Download and Compile QEMU
if: steps.cache-qemu.outputs.cache-hit != 'true' if: steps.cache-qemu.outputs.cache-hit != 'true'
run: ../scripts/install-qemu.sh ${{ env.qemu_version }} ${{ matrix.arch }} run: .github/scripts/install-qemu.sh ${{ env.qemu_version }}
- name: Install QEMU
run: |
cd qemu-${{ env.qemu_version }} && sudo make install
qemu-system-${{ matrix.arch }} --version
- name: Prepare rootfs - name: Prepare rootfs
run: make other-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }} run: make other-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }}