From 1a53308a7e31f1d219db1efd2486bdb9d6ee6efa Mon Sep 17 00:00:00 2001 From: QiangGe <916482193@qq.com> Date: Sat, 20 Jan 2024 15:08:12 +0800 Subject: [PATCH 1/2] rename zh file name to en ones --- .../main.py" => py/046-QuanPaiLie/main.py | 0 .../readme.md" => py/046-QuanPaiLie/readme.md | 0 .../main.py" => py/088-HeBingLiangGeYouXuShuZu/main.py | 0 .../readme.md" => py/088-HeBingLiangGeYouXuShuZu/readme.md | 0 .../main.py" => py/206-FanZhuanLianBiao/main.py | 0 .../readme.md" => py/206-FanZhuanLianBiao/readme.md | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename "py/046-\345\205\250\346\216\222\345\210\227/main.py" => py/046-QuanPaiLie/main.py (100%) rename "py/046-\345\205\250\346\216\222\345\210\227/readme.md" => py/046-QuanPaiLie/readme.md (100%) rename "py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/main.py" => py/088-HeBingLiangGeYouXuShuZu/main.py (100%) rename "py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/readme.md" => py/088-HeBingLiangGeYouXuShuZu/readme.md (100%) rename "py/206-\345\217\215\350\275\254\351\223\276\350\241\250/main.py" => py/206-FanZhuanLianBiao/main.py (100%) rename "py/206-\345\217\215\350\275\254\351\223\276\350\241\250/readme.md" => py/206-FanZhuanLianBiao/readme.md (100%) diff --git "a/py/046-\345\205\250\346\216\222\345\210\227/main.py" b/py/046-QuanPaiLie/main.py similarity index 100% rename from "py/046-\345\205\250\346\216\222\345\210\227/main.py" rename to py/046-QuanPaiLie/main.py diff --git "a/py/046-\345\205\250\346\216\222\345\210\227/readme.md" b/py/046-QuanPaiLie/readme.md similarity index 100% rename from "py/046-\345\205\250\346\216\222\345\210\227/readme.md" rename to py/046-QuanPaiLie/readme.md diff --git "a/py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/main.py" b/py/088-HeBingLiangGeYouXuShuZu/main.py similarity index 100% rename from "py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/main.py" rename to py/088-HeBingLiangGeYouXuShuZu/main.py diff --git "a/py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/readme.md" b/py/088-HeBingLiangGeYouXuShuZu/readme.md similarity index 100% rename from "py/088-\345\220\210\345\271\266\344\270\244\344\270\252\346\234\211\345\272\217\346\225\260\347\273\204/readme.md" rename to py/088-HeBingLiangGeYouXuShuZu/readme.md diff --git "a/py/206-\345\217\215\350\275\254\351\223\276\350\241\250/main.py" b/py/206-FanZhuanLianBiao/main.py similarity index 100% rename from "py/206-\345\217\215\350\275\254\351\223\276\350\241\250/main.py" rename to py/206-FanZhuanLianBiao/main.py diff --git "a/py/206-\345\217\215\350\275\254\351\223\276\350\241\250/readme.md" b/py/206-FanZhuanLianBiao/readme.md similarity index 100% rename from "py/206-\345\217\215\350\275\254\351\223\276\350\241\250/readme.md" rename to py/206-FanZhuanLianBiao/readme.md -- Gitee From 50ae924736c4dbd169e72bf6670be68a04a57461 Mon Sep 17 00:00:00 2001 From: QiangGe <916482193@qq.com> Date: Sun, 10 Mar 2024 11:57:06 +0800 Subject: [PATCH 2/2] fix stash unstash --- Jenkinsfile | 8 ++++---- build_run.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 42d4f86..2ceefee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,12 +9,12 @@ pipeline { script { stage('code_pulling') { sh 'pwd && ls -lat' - stash includes: '*/**', name: 'repo_stash' + // stash includes: '*/**', name: 'repo_stash' } timeout(activity: true, time: 600, unit: 'SECONDS') { - node(env.LABEL) { - unstash 'repo_stash' + // node(env.LABEL) { + // unstash 'repo_stash' sh """ bash -x build_run.sh """ @@ -30,7 +30,7 @@ pipeline { } junit testResults:"report_pytest.xml", allowEmptyResults: false archiveArtifacts artifacts: "report_pytest.xml", fingerprint: true - } + // } } } } diff --git a/build_run.sh b/build_run.sh index 9c3a7bb..b90d740 100644 --- a/build_run.sh +++ b/build_run.sh @@ -9,6 +9,7 @@ which cppcheck # apt update && apt install -y gcovr lcov cppcheck env | grep PATH cmake -DENABLE_COVERAGE=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. +# -GNinja cppcheck --enable=all --inconclusive --xml --xml-version=2 --project=compile_commands.json -ibuild -iCMakeFiles -ilibgtest* .. 2> cppcheck.xml make -- Gitee