From 30fbac0606fd2c02e2bbde9dcaf627f92e902349 Mon Sep 17 00:00:00 2001 From: Youjie Zheng Date: Sat, 18 May 2024 14:26:35 +0800 Subject: [PATCH 01/18] chore: call external workflow --- .cargo/config.toml | 6 ------ .github/workflows/test-external.yaml | 16 ++++++++++++++++ .github/workflows/test-extranel.yaml | 24 ------------------------ 3 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 .cargo/config.toml create mode 100644 .github/workflows/test-external.yaml delete mode 100644 .github/workflows/test-extranel.yaml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index bac0add..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,6 +0,0 @@ -# Just used for rust-analyzer. -[build] -target = "riscv64gc-unknown-none-elf" -# target = 'aarch64-unknown-none-softfloat' -# target = 'x86_64-unknown-none' -# target = 'loongarch64-unknown-none' diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml new file mode 100644 index 0000000..d64add1 --- /dev/null +++ b/.github/workflows/test-external.yaml @@ -0,0 +1,16 @@ +name: TestExternal + +on: + workflow_dispatch: + push: + pull_request: + +jobs: + test-external: + uses: Azure-stars/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} diff --git a/.github/workflows/test-extranel.yaml b/.github/workflows/test-extranel.yaml deleted file mode 100644 index 29b8901..0000000 --- a/.github/workflows/test-extranel.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: TestExternal - -on: - workflow_dispatch: - push: - pull_request: - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: convictional/trigger-workflow-and-wait@v1.6.1 - with: - owner: yfblock - repo: rcore-tutorial-v3-with-hal-component - github_token: ${{ secrets.PERSONAL_TOKEN }} - github_user: yfblock - workflow_file_name: test-run.yml - ref: ch7 - wait_interval: 10 - client_payload: '{"commit": "${{ github.sha}}"}' - propagate_failure: true - trigger_workflow: true - wait_workflow: true From f6342efe1067c70b47f2e2561cc5f45723eee5ff Mon Sep 17 00:00:00 2001 From: Youjie Zheng Date: Sat, 18 May 2024 15:04:48 +0800 Subject: [PATCH 02/18] chore: build doc for riscv64gc-unknown-none-elf target --- .github/workflows/doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/doc.yaml b/.github/workflows/doc.yaml index c6b7076..dee4eb4 100644 --- a/.github/workflows/doc.yaml +++ b/.github/workflows/doc.yaml @@ -18,7 +18,7 @@ jobs: - name: add target run: rustup target add riscv64gc-unknown-none-elf - name: generate doc - run: cargo doc --no-deps --all-features + run: cargo doc --no-deps --all-features --target riscv64gc-unknown-none-elf - name: Deploy to Github Pages uses: JamesIves/github-pages-deploy-action@v4 with: From ce18f7cc767f433cd83ad0bb324d27d3d4fa673c Mon Sep 17 00:00:00 2001 From: chyyuu Date: Sat, 18 May 2024 16:33:45 +0800 Subject: [PATCH 03/18] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 91ac6a9..146b5bd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # arch crate +test > A crate help you to write a os that support multiple platforms. From 16eb71d0956bfb33fc6eff3acfc3cac98c8f104d Mon Sep 17 00:00:00 2001 From: Youjie Zheng Date: Sat, 18 May 2024 20:26:31 +0800 Subject: [PATCH 04/18] chore: update Main repo yml --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index d64add1..f5ac267 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -7,7 +7,7 @@ on: jobs: test-external: - uses: Azure-stars/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From a1eeebf1b7fe43c063e863f597dde121c2e99f3f Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 12:38:41 +0800 Subject: [PATCH 05/18] update test-external.yaml: use github.repository_owner --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index f5ac267..090649a 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -7,7 +7,7 @@ on: jobs: test-external: - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + uses: ${{ github.repository_owner }}/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From ec8c09b1110fea7cb3d7579d667c397e1de7ebe4 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 12:50:40 +0800 Subject: [PATCH 06/18] test --- .github/workflows/test-external.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 090649a..00c4f12 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -6,8 +6,15 @@ on: pull_request: jobs: + test-output: + steps: + -name: output + run: | + echo ${{ github.repository_owner }} + echo ${{ github.repository }} + test-external: - uses: ${{ github.repository_owner }}/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From 1bf24e7f0b56c5a0134e505c6f724efa25b56500 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 12:53:17 +0800 Subject: [PATCH 07/18] test2 --- .github/workflows/test-external.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 00c4f12..bc997cd 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -8,10 +8,10 @@ on: jobs: test-output: steps: - -name: output - run: | - echo ${{ github.repository_owner }} - echo ${{ github.repository }} + - name: output + run: | + echo ${{ github.repository_owner }} + echo ${{ github.repository }} test-external: uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 @@ -21,3 +21,4 @@ jobs: CallerPackage: polyhal CallerRepository: ${{ github.repository }} CallerCommit: ${{ github.sha }} + \ No newline at end of file From 9aefc2c360c865388bd15cc48eba0847d75931b6 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 12:54:59 +0800 Subject: [PATCH 08/18] test3 --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index bc997cd..cc0c96c 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -7,6 +7,7 @@ on: jobs: test-output: + runs-on: ubuntu-latest steps: - name: output run: | @@ -21,4 +22,3 @@ jobs: CallerPackage: polyhal CallerRepository: ${{ github.repository }} CallerCommit: ${{ github.sha }} - \ No newline at end of file From a8096ade1ab38c195544bc6bf080ee2791ed10a4 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 13:05:31 +0800 Subject: [PATCH 09/18] test4 --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index cc0c96c..ec5b8ec 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -15,7 +15,7 @@ jobs: echo ${{ github.repository }} test-external: - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + uses: ${{ github.repository_owner }}/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From cbd6f77ab3dcd133bd7f44264277901899c7759a Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 18:39:11 +0800 Subject: [PATCH 10/18] test5 --- .github/workflows/test-external.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index ec5b8ec..5d7ebc8 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -15,7 +15,8 @@ jobs: echo ${{ github.repository }} test-external: - uses: ${{ github.repository_owner }}/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + if github.repository_owner == 'sysones' + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From 13be40c9aec45d073a0db4db6891b8412c0b8a01 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 18:40:31 +0800 Subject: [PATCH 11/18] test6 --- .github/workflows/test-external.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 5d7ebc8..d91b1f8 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -15,7 +15,7 @@ jobs: echo ${{ github.repository }} test-external: - if github.repository_owner == 'sysones' + if: github.repository_owner == 'sysones' uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository From 71cc72e87c8c1efd01e56ec6f69a3618706a2be5 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:20:47 +0800 Subject: [PATCH 12/18] test7 --- .github/workflows/test-external.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index d91b1f8..46dc6f5 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -16,7 +16,11 @@ jobs: test-external: if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + strategy: + fail-fast: false + matrix: + branch: [ch7] + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@${{ matrix.branch }} with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest From b4920b6a8d5b0681e462d648a6ea217c3419b691 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:29:17 +0800 Subject: [PATCH 13/18] test8 --- .github/workflows/test-external.yaml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 46dc6f5..9844b51 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -16,14 +16,18 @@ jobs: test-external: if: github.repository_owner == 'sysones' - strategy: - fail-fast: false - matrix: - branch: [ch7] - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@${{ matrix.branch }} - with: - # The directory to Top test, which need to be empty or not exist in this repository - TopTestDirectory: RcoreTest - CallerPackage: polyhal - CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} + steps: + - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} + - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} \ No newline at end of file From 8cd3758e6b8a60b78da333089f65c8bf376d64ec Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:32:23 +0800 Subject: [PATCH 14/18] test9 --- .github/workflows/test-external.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index 9844b51..b82093c 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -14,9 +14,8 @@ jobs: echo ${{ github.repository_owner }} echo ${{ github.repository }} - test-external: + test-external-rcore-ch7: if: github.repository_owner == 'sysones' - steps: - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository @@ -24,10 +23,12 @@ jobs: CallerPackage: polyhal CallerRepository: ${{ github.repository }} CallerCommit: ${{ github.sha }} + test-external-rcore-ch6: + if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: # The directory to Top test, which need to be empty or not exist in this repository TopTestDirectory: RcoreTest CallerPackage: polyhal CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} \ No newline at end of file + CallerCommit: ${{ github.sha }} \ No newline at end of file From d49a501322a95a0abaa18817b57ee2354dc86971 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:34:58 +0800 Subject: [PATCH 15/18] test10 --- .github/workflows/test-external.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index b82093c..ca1983b 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -14,7 +14,7 @@ jobs: echo ${{ github.repository_owner }} echo ${{ github.repository }} - test-external-rcore-ch7: + test-external-rcore-c: if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: @@ -23,7 +23,8 @@ jobs: CallerPackage: polyhal CallerRepository: ${{ github.repository }} CallerCommit: ${{ github.sha }} - test-external-rcore-ch6: + + test-external-rcore-d: if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 with: From 192e97239aec2ab170626800aa24cdf610dfa21e Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:38:35 +0800 Subject: [PATCH 16/18] test11 --- .github/workflows/test-external.yaml | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index ca1983b..df495b8 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -14,22 +14,22 @@ jobs: echo ${{ github.repository_owner }} echo ${{ github.repository }} - test-external-rcore-c: - if: github.repository_owner == 'sysones' - - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 - with: - # The directory to Top test, which need to be empty or not exist in this repository - TopTestDirectory: RcoreTest - CallerPackage: polyhal - CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} + test-external-rcore-ch6: + if: github.repository_owner == 'sysones' + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} - test-external-rcore-d: + test-external-rcore-ch7: if: github.repository_owner == 'sysones' - - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 - with: - # The directory to Top test, which need to be empty or not exist in this repository - TopTestDirectory: RcoreTest - CallerPackage: polyhal - CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} \ No newline at end of file + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} \ No newline at end of file From 9edd7248b04abccaa27abe884f37b9e70b64b50f Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 20:39:43 +0800 Subject: [PATCH 17/18] test12 --- .github/workflows/test-external.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index df495b8..ecc78d5 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -15,14 +15,14 @@ jobs: echo ${{ github.repository }} test-external-rcore-ch6: - if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 - with: - # The directory to Top test, which need to be empty or not exist in this repository - TopTestDirectory: RcoreTest - CallerPackage: polyhal - CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} + if: github.repository_owner == 'sysones' + uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 + with: + # The directory to Top test, which need to be empty or not exist in this repository + TopTestDirectory: RcoreTest + CallerPackage: polyhal + CallerRepository: ${{ github.repository }} + CallerCommit: ${{ github.sha }} test-external-rcore-ch7: if: github.repository_owner == 'sysones' From 48c6f5e30dcb7c4aca8c9f8b6d234acc6e022845 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Thu, 23 May 2024 23:50:39 +0800 Subject: [PATCH 18/18] update test-external.yaml --- .github/workflows/test-external.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/test-external.yaml b/.github/workflows/test-external.yaml index ecc78d5..187a03e 100644 --- a/.github/workflows/test-external.yaml +++ b/.github/workflows/test-external.yaml @@ -14,16 +14,6 @@ jobs: echo ${{ github.repository_owner }} echo ${{ github.repository }} - test-external-rcore-ch6: - if: github.repository_owner == 'sysones' - uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 - with: - # The directory to Top test, which need to be empty or not exist in this repository - TopTestDirectory: RcoreTest - CallerPackage: polyhal - CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} - test-external-rcore-ch7: if: github.repository_owner == 'sysones' uses: sysones/rcore-tutorial-v3-with-hal-component/.github/workflows/test-run.yml@ch7 @@ -32,4 +22,4 @@ jobs: TopTestDirectory: RcoreTest CallerPackage: polyhal CallerRepository: ${{ github.repository }} - CallerCommit: ${{ github.sha }} \ No newline at end of file + CallerCommit: ${{ github.sha }} \ No newline at end of file