From ace44801508ade20f8d02be478b08de82644ec66 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:22:04 +0800 Subject: [PATCH 01/11] Add ci on ubuntu 20.04 for Gitee --- .workflow/ci-ubuntu.yml | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .workflow/ci-ubuntu.yml diff --git a/.workflow/ci-ubuntu.yml b/.workflow/ci-ubuntu.yml new file mode 100644 index 00000000..ceb092c8 --- /dev/null +++ b/.workflow/ci-ubuntu.yml @@ -0,0 +1,65 @@ +version: '1.0' +name: ci-ubuntu +displayName: ci-ubuntu +triggers: + trigger: auto + pr: + branches: + precise: + - main + paths: + precise: + - goldfish/ + - tests/ + - src/ + - xmake/packages/ + - xmake.lua + - .workflow/ + push: + branches: + precise: + - main + paths: + precise: + - goldfish/ + - tests/ + - src/ + - xmake/packages/ + - xmake.lua + - .workflow/ + +variables: + XMAKE_MAIN_REPO: 'https://gitee.com/tboox/xmake-repo.git' + XMAKE_BINARY_REPO: 'https://gitee.com/xmake-mirror/build-artifacts.git' + XMAKE_ROOT: y + + +stages: + - name: build_and_test + displayName: build_and_test + strategy: fast + trigger: auto + executor: [] + steps: + - step: build@gcc + name: build + displayName: Build and Test + gccVersion: '8.4' + commands: + - wget https://gitee.com/XmacsLabs/mogan/attach_files/1813514/download -O /tmp/xmake.deb + - sha1sum /tmp/xmake.deb | grep ac3629bd0fa66f179aef35dc00b7a1c89735651a + - apt install /tmp/xmake.deb + - sed -i '/github\.com/d' xmake/packages/s/s7/xmake.lua + - xmake repo --update + - sed -i '/github\.com/d' xmake/packages/s/s7/xmake.lua + - sed -i '/github\.com/d' xmake/packages/t/tbox/xmake.lua + - xmake config --tbox=y --yes -vD + - xmake build --yes -vD goldfish + - bin/goldfish -l tests/test_all.scm + caches: [ + ~/.xmake/packages + ] + notify: [] + strategy: + retry: '0' + stepTimeout: 30 -- Gitee From 4ca8786f8848c25af6ec56eccd107fca012dad2d Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:31:00 +0800 Subject: [PATCH 02/11] wip --- xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmake.lua b/xmake.lua index a2255a0b..b8baebe7 100644 --- a/xmake.lua +++ b/xmake.lua @@ -30,6 +30,9 @@ end target ("goldfish") do set_languages("c++98") + if is_plat("linux") then + set_config("ld", "g++") + end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") add_packages("s7") -- Gitee From 9d4e9ee1f8b45f9fba0a14fe5863dfd0b7de3f66 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:34:16 +0800 Subject: [PATCH 03/11] wip --- xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index b8baebe7..a771077d 100644 --- a/xmake.lua +++ b/xmake.lua @@ -31,7 +31,7 @@ end target ("goldfish") do set_languages("c++98") if is_plat("linux") then - set_config("ld", "g++") + set_toolset("ld", "g++") end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") -- Gitee From 5eb98b9a588b351132a8ae1439823525433fa236 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:39:46 +0800 Subject: [PATCH 04/11] wip --- .workflow/ci-ubuntu.yml | 2 +- xmake.lua | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.workflow/ci-ubuntu.yml b/.workflow/ci-ubuntu.yml index ceb092c8..4a0c4b00 100644 --- a/.workflow/ci-ubuntu.yml +++ b/.workflow/ci-ubuntu.yml @@ -44,7 +44,7 @@ stages: - step: build@gcc name: build displayName: Build and Test - gccVersion: '8.4' + gccVersion: '9.4' commands: - wget https://gitee.com/XmacsLabs/mogan/attach_files/1813514/download -O /tmp/xmake.deb - sha1sum /tmp/xmake.deb | grep ac3629bd0fa66f179aef35dc00b7a1c89735651a diff --git a/xmake.lua b/xmake.lua index a771077d..a2255a0b 100644 --- a/xmake.lua +++ b/xmake.lua @@ -30,9 +30,6 @@ end target ("goldfish") do set_languages("c++98") - if is_plat("linux") then - set_toolset("ld", "g++") - end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") add_packages("s7") -- Gitee From 50e059bb5785bec1d36212f353fbe07f3d2b8c47 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:48:34 +0800 Subject: [PATCH 05/11] wip --- .workflow/ci-debian.yml | 2 +- xmake.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.workflow/ci-debian.yml b/.workflow/ci-debian.yml index fde5194d..850f6def 100644 --- a/.workflow/ci-debian.yml +++ b/.workflow/ci-debian.yml @@ -2,7 +2,7 @@ version: '1.0' name: ci-debian displayName: ci-debian triggers: - trigger: auto + trigger: manual push: branches: precise: diff --git a/xmake.lua b/xmake.lua index a2255a0b..cb4326f9 100644 --- a/xmake.lua +++ b/xmake.lua @@ -30,6 +30,9 @@ end target ("goldfish") do set_languages("c++98") + if is_plat("linux") then + set_toolset("cxx", "g++") + end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") add_packages("s7") -- Gitee From 63f14becbcb3db522a9a8fc4e4bbf34d01a5651f Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:53:23 +0800 Subject: [PATCH 06/11] wip --- xmake.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xmake.lua b/xmake.lua index cb4326f9..69e10148 100644 --- a/xmake.lua +++ b/xmake.lua @@ -29,10 +29,6 @@ else end target ("goldfish") do - set_languages("c++98") - if is_plat("linux") then - set_toolset("cxx", "g++") - end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") add_packages("s7") -- Gitee From 9c26034d6e8192f254ded2f4b731eafabcb59036 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 11:58:54 +0800 Subject: [PATCH 07/11] wip --- xmake.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xmake.lua b/xmake.lua index 69e10148..2aea3f5c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -29,6 +29,9 @@ else end target ("goldfish") do + if is_plat("linux") then + set_toolset("cxx", "g++") + end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") add_packages("s7") -- Gitee From d6c880900199e19db968c33bf38215e51f645aea Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 12:06:50 +0800 Subject: [PATCH 08/11] wip --- xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmake.lua b/xmake.lua index 2aea3f5c..ef56d201 100644 --- a/xmake.lua +++ b/xmake.lua @@ -29,8 +29,9 @@ else end target ("goldfish") do + set_languages("c++98") if is_plat("linux") then - set_toolset("cxx", "g++") + add_syslinks("stdc++") end set_targetdir("$(projectdir)/bin/") add_files ("src/goldfish.cpp") -- Gitee From 471b4b7efe5210df0b2905f57ebbd6765deacc8f Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 12:11:32 +0800 Subject: [PATCH 09/11] wip --- xmake.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake.lua b/xmake.lua index ef56d201..436c9956 100644 --- a/xmake.lua +++ b/xmake.lua @@ -31,6 +31,7 @@ end target ("goldfish") do set_languages("c++98") if is_plat("linux") then + -- for Ubuntu 20.04 add_syslinks("stdc++") end set_targetdir("$(projectdir)/bin/") -- Gitee From 42d7c29762070a48b40a1bf453f9930ae57e8025 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 12:16:24 +0800 Subject: [PATCH 10/11] timeout to 15m --- .workflow/ci-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workflow/ci-ubuntu.yml b/.workflow/ci-ubuntu.yml index 4a0c4b00..272c7696 100644 --- a/.workflow/ci-ubuntu.yml +++ b/.workflow/ci-ubuntu.yml @@ -62,4 +62,4 @@ stages: notify: [] strategy: retry: '0' - stepTimeout: 30 + stepTimeout: 15 -- Gitee From 2514ba20cca02a6d5db861e73815b709c77a6c4c Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Fri, 9 Aug 2024 12:17:28 +0800 Subject: [PATCH 11/11] wip --- .workflow/ci-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.workflow/ci-ubuntu.yml b/.workflow/ci-ubuntu.yml index 272c7696..a0952e43 100644 --- a/.workflow/ci-ubuntu.yml +++ b/.workflow/ci-ubuntu.yml @@ -44,7 +44,7 @@ stages: - step: build@gcc name: build displayName: Build and Test - gccVersion: '9.4' + gccVersion: '8.4' commands: - wget https://gitee.com/XmacsLabs/mogan/attach_files/1813514/download -O /tmp/xmake.deb - sha1sum /tmp/xmake.deb | grep ac3629bd0fa66f179aef35dc00b7a1c89735651a -- Gitee