From 2acc9d9f518454253ed936e95451413a1f569ca8 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Thu, 2 Nov 2023 22:49:20 -0400 Subject: [PATCH 1/9] Add CI build --- .gitlab-ci.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..2a8cc0c7 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,52 @@ +default: + image: beagle/debian-build + +build-on-amd64: + stage: build + tags: + - docker-amd64 + script: + - make package + - mkdir public + - cp ../librobotcontrol_*.deb public/ + artifacts: + paths: + - public + +build-on-aarch64: + stage: build + tags: + - aarch64 + script: + - make package + - mkdir public + - cp ../librobotcontrol_*.deb public/ + artifacts: + paths: + - public + +build-on-riscv64: + image: beagle/ubuntu-build + stage: build + tags: + - riscv64 + script: + - make package + - mkdir public + - cp ../librobotcontrol_*.deb public/ + artifacts: + paths: + - public + +build-on-armv7: + image: beagle/ubuntu-build + stage: build + tags: + - armv7 + script: + - make package + - mkdir public + - cp ../librobotcontrol_*.deb public/ + artifacts: + paths: + - public From 1974b76fd578ff9f5d1481ebd34f6801b9edeb6a Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 15 Nov 2023 22:48:47 -0500 Subject: [PATCH 2/9] docs: start with basic index --- docs/index.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index dd7c4d1e..9004e3f8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,5 +3,6 @@ Robotics Control Library ######################## -.. doxygenpage:: indexpage +.. doxygenpage:: index + :project: librobotcontrol From f5218ff7f610538f9539d428872cbed4e5c1094d Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Tue, 28 Nov 2023 22:39:01 -0500 Subject: [PATCH 3/9] CI: enable tags for all archs --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a8cc0c7..c5ec4523 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ default: build-on-amd64: stage: build tags: - - docker-amd64 + - docker-amd64-ci script: - make package - mkdir public @@ -16,7 +16,7 @@ build-on-amd64: build-on-aarch64: stage: build tags: - - aarch64 + - docker-aarch64-ci script: - make package - mkdir public @@ -29,7 +29,7 @@ build-on-riscv64: image: beagle/ubuntu-build stage: build tags: - - riscv64 + - docker-riscv64-ci script: - make package - mkdir public @@ -42,7 +42,7 @@ build-on-armv7: image: beagle/ubuntu-build stage: build tags: - - armv7 + - docker-armhf-ci script: - make package - mkdir public From 7d57b3d229a36c84ed3da69ab82b7c62a4053fed Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Tue, 28 Nov 2023 22:48:30 -0500 Subject: [PATCH 4/9] CI: fix tag for amd64 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5ec4523..62c00d74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ default: build-on-amd64: stage: build tags: - - docker-amd64-ci + - docker-amd64 script: - make package - mkdir public From 092230e60a9947119a33ab1bc51e8a113ceb1017 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 29 Nov 2023 21:27:28 -0500 Subject: [PATCH 5/9] CI: try parallel/matrix build --- .gitlab-ci.yml | 52 +++++++++----------------------------------------- 1 file changed, 9 insertions(+), 43 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62c00d74..ccc5ec34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,48 +1,14 @@ -default: - image: beagle/debian-build - -build-on-amd64: +build: stage: build + parallel: + matrix: + - IMAGE: debian-build + TAG: [docker-amd64, docker-aarch64-ci, docker-armhf] + - IMAGE: ubuntu-build + TAG: [docker-riscv64-ci] + image: beagle/${IMAGE} tags: - - docker-amd64 - script: - - make package - - mkdir public - - cp ../librobotcontrol_*.deb public/ - artifacts: - paths: - - public - -build-on-aarch64: - stage: build - tags: - - docker-aarch64-ci - script: - - make package - - mkdir public - - cp ../librobotcontrol_*.deb public/ - artifacts: - paths: - - public - -build-on-riscv64: - image: beagle/ubuntu-build - stage: build - tags: - - docker-riscv64-ci - script: - - make package - - mkdir public - - cp ../librobotcontrol_*.deb public/ - artifacts: - paths: - - public - -build-on-armv7: - image: beagle/ubuntu-build - stage: build - tags: - - docker-armhf-ci + - ${TAG} script: - make package - mkdir public From a91c2acb42086f384fe8b4d0c97aff7ee786a0ec Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 29 Nov 2023 22:17:15 -0500 Subject: [PATCH 6/9] CI: try to combine artifacts --- .gitlab-ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccc5ec34..2cb0b5d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,22 @@ build: script: - make package - mkdir public - - cp ../librobotcontrol_*.deb public/ + - cp ../librobotcontrol_*.deb public/$(dpkg --print-architecture) + artifacts: + paths: + - public/$(dpkg --print-architecture) + +deploy: + image: beagle/debian-build + stage: deploy + dependencies: + - "build: [debian-build, docker-amd64]" + - "build: [debian-build, docker-aarch64-ci]" + - "build: [debian-build, docker-armhf]" + - "build: [ubuntu-build, docker-riscv64-ci]" + script: + - apindex public artifacts: paths: - public + From 01d805e284ab78537bdef1d1c94241d57b766715 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 29 Nov 2023 22:24:05 -0500 Subject: [PATCH 7/9] CI: remove construct --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cb0b5d9..ab87c6c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,11 +11,13 @@ build: - ${TAG} script: - make package - - mkdir public - - cp ../librobotcontrol_*.deb public/$(dpkg --print-architecture) + - dpkg --print-architecture | xargs -n 1 mkdir + - dpkg --print-architecture | xargs -n 1 cp ../librobotcontrol_*.deb + - mkdir -p public + - dpkg --print-architecture | xargs -n 1 -i mv {} public artifacts: paths: - - public/$(dpkg --print-architecture) + - public deploy: image: beagle/debian-build From 691eb4f97a0a619f871cc2c519e58af8ef4c9926 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 29 Nov 2023 22:43:48 -0500 Subject: [PATCH 8/9] CI: publish pages, do not make subdirs --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab87c6c2..ce439675 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,15 +11,13 @@ build: - ${TAG} script: - make package - - dpkg --print-architecture | xargs -n 1 mkdir - - dpkg --print-architecture | xargs -n 1 cp ../librobotcontrol_*.deb - mkdir -p public - - dpkg --print-architecture | xargs -n 1 -i mv {} public + - dpkg --print-architecture | xargs -n 1 cp ../librobotcontrol_{}.deb public artifacts: paths: - public -deploy: +pages: image: beagle/debian-build stage: deploy dependencies: From 1da6e6bda0f7b224d377bdbb3e1c48a866b0ec90 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Wed, 29 Nov 2023 22:44:54 -0500 Subject: [PATCH 9/9] CI: just use wildcard --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce439675..bce2f326 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ build: script: - make package - mkdir -p public - - dpkg --print-architecture | xargs -n 1 cp ../librobotcontrol_{}.deb public + - cp ../librobotcontrol_*.deb public/ artifacts: paths: - public