From 4ee0dcb6fbc2955f3e935e109e564b42880264e9 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 11:12:51 +0100 Subject: [PATCH 01/28] create checkin ci script --- .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f5fabc6 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,29 @@ +checkout: + stage: build + script: + - echo "checkout code" + +configure: + stage: build + script: + - echo "configure serialization_lib" + +build-library: + stage: build + script: + - echo "build serialization_lib" + +run-gtest: + stage: test + script: + - echo "running Gtests" + +run-npy-tests: + stage: test + script: + - echo "running npy tests" + +run-pytests: + stage: test + script: + - echo "running pytests" -- GitLab From 5bf7126fa49ed897d10fe04f317d23712c7cb009 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 11:32:51 +0100 Subject: [PATCH 02/28] add runner --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5fabc6..844554b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +default: + tags: + - arm64-shared checkout: stage: build script: -- GitLab From 46a64135a3d247c537131d73ee4ac38f31781d43 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 13:50:23 +0100 Subject: [PATCH 03/28] change runner --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 844554b..8a37199 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,13 @@ default: tags: - - arm64-shared + - static-runner-temp + checkout: stage: build script: - echo "checkout code" + - echo $CI_PROJECT_DIR + - ls -l $CI_PROJECT_DIR configure: stage: build -- GitLab From 9c58a913fecd7cf0cbfa7c59d9529bb2320a8657 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 13:51:28 +0100 Subject: [PATCH 04/28] change runner back to arm64-shared --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a37199..8d8b260 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ default: tags: - - static-runner-temp + - arm64-shared checkout: stage: build -- GitLab From 5e04dfae42a86e2b23115d5f196fd84bae905576 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 14:35:04 +0100 Subject: [PATCH 05/28] install reqs --- .gitlab-ci.yml | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d8b260..c81f64f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,36 @@ +stages: + - prep + - build + - test + default: tags: - - arm64-shared - -checkout: - stage: build - script: - - echo "checkout code" - - echo $CI_PROJECT_DIR - - ls -l $CI_PROJECT_DIR + - amd64-shared + +install-reqs: + stage: prep + script: | + apt update && apt upgrade -y && apt install -y \ + build-essential\ + clang\ + software-properties-common\ + cmake\ + clang-18 + + update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 + configure: stage: build - script: - - echo "configure serialization_lib" + script: | + mkdir build + cd build + cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. build-library: stage: build + needs: ["configure"] script: - echo "build serialization_lib" -- GitLab From 15f15950dbe70ae757ec7b56f5242eadb7833764 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 14:38:38 +0100 Subject: [PATCH 06/28] fix linebreak --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c81f64f..b255980 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,11 +10,11 @@ default: install-reqs: stage: prep script: | - apt update && apt upgrade -y && apt install -y \ - build-essential\ - clang\ - software-properties-common\ - cmake\ + apt update && apt upgrade -y && apt install -y \\ + build-essential \\ + clang \\ + software-properties-common \\ + cmake \\ clang-18 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 -- GitLab From 4cd5273bfadc03e9a38b840fde35a07245506de7 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 14:40:30 +0100 Subject: [PATCH 07/28] fix linebreak again --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b255980..8d79687 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,11 +10,11 @@ default: install-reqs: stage: prep script: | - apt update && apt upgrade -y && apt install -y \\ - build-essential \\ - clang \\ - software-properties-common \\ - cmake \\ + apt update && apt upgrade -y && apt install -y + build-essential + clang + software-properties-common + cmake clang-18 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 -- GitLab From a3e22e06a8508dd6d13c1a53fd3c2c3b39ad18e3 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 14:42:47 +0100 Subject: [PATCH 08/28] remove linebreak attempt --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d79687..169e7c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,12 +10,7 @@ default: install-reqs: stage: prep script: | - apt update && apt upgrade -y && apt install -y - build-essential - clang - software-properties-common - cmake - clang-18 + apt update && apt upgrade -y && apt install -y build-essential clang software-properties-common cmake clang-18 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 -- GitLab From 9a2fa51cb6912b3a16ab22a2d0341db3691d060d Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Tue, 15 Jul 2025 14:47:17 +0100 Subject: [PATCH 09/28] disable debian frontend --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 169e7c5..7e44936 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,9 @@ stages: - build - test +variables: + DEBIAN_FRONTEND: noninteractive + default: tags: - amd64-shared -- GitLab From 72ad9979a7d1a33d7699e04b655dc8ba2e440f95 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 12:39:36 +0100 Subject: [PATCH 10/28] create ci dockerfile --- Dockerfile | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..13b5a90 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,38 @@ +FROM ubuntu:24.04 + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt update && apt upgrade -y && apt install -y \ + git\ + wget\ + clang\ + cmake\ + clang-18\ + libssl-dev\ + zlib1g-dev\ + libbz2-dev\ + libreadline-dev\ + libsqlite3-dev\ + libffi-dev\ + liblzma-dev\ + tk-dev\ + libgdbm-dev\ + libncursesw5-dev\ + xz-utils\ + uuid-dev + +# Set up Python +RUN git clone https://github.com/pyenv/pyenv.git .pyenv +ENV PYENV_ROOT="$HOME/.pyenv" +ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH +RUN pyenv install 3.12.3 &&\ + pyenv global 3.12.3 &&\ + pyenv rehash + +# Point clang to clang-18 +RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 &&\ + update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 + +COPY ser_lib_check_in.sh / + +CMD [ "/bin/bash" ] \ No newline at end of file -- GitLab From 18737706616028a126a3d5b3e522373e4e50e2f6 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 12:40:32 +0100 Subject: [PATCH 11/28] remove copy cmd from dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13b5a90..5a469d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,4 @@ RUN pyenv install 3.12.3 &&\ RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 &&\ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 -COPY ser_lib_check_in.sh / - CMD [ "/bin/bash" ] \ No newline at end of file -- GitLab From 5de0d7bf607a81ea5cc59e0bc3b4a080a404427d Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 12:55:32 +0100 Subject: [PATCH 12/28] reference docker image --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e44936..d12e78e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +image: registry.gitlab.arm.com/tosa/tosa-serialization:dev + stages: - prep - build -- GitLab From c5c99f931af251eb3224ab3060dd1af38a699353 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:00:25 +0100 Subject: [PATCH 13/28] add simple build and test logic --- .gitlab-ci.yml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d12e78e..4062020 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,18 +15,29 @@ default: install-reqs: stage: prep script: | - apt update && apt upgrade -y && apt install -y build-essential clang software-properties-common cmake clang-18 + git submodule update --init --recursive - update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 - update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 + mkdir build + cd build + cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. + + make -j $(nproc) + + ctest + + cd .. + + python3 test/scripts/test_npy_fileio.py + + pip3 install flatbuffers==24.3.25 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 + + pytest configure: stage: build - script: | - mkdir build - cd build - cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. + script: + - echo "building..." build-library: stage: build -- GitLab From 2d8dc01a5e8835c9641bc15b29a187d0fe5b56ce Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:22:01 +0100 Subject: [PATCH 14/28] make workspace persistent across jobs --- .gitlab-ci.yml | 61 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4062020..a92df8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ image: registry.gitlab.arm.com/tosa/tosa-serialization:dev stages: - - prep - build - test @@ -12,8 +11,12 @@ default: tags: - amd64-shared -install-reqs: - stage: prep +build-ser-lib: + stage: build + artifacts: + paths: + - ./ + expire_in: 1h script: | git submodule update --init --recursive @@ -23,39 +26,37 @@ install-reqs: make -j $(nproc) - ctest - - cd .. - - python3 test/scripts/test_npy_fileio.py - - pip3 install flatbuffers==24.3.25 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 - - pytest - - -configure: - stage: build - script: - - echo "building..." - -build-library: - stage: build - needs: ["configure"] - script: - - echo "build serialization_lib" run-gtest: stage: test - script: - - echo "running Gtests" + needs: ["build-ser-lib"] + dependencies: + - build-ser-lib + variables: + GIT_STRATEGY: none + script: | + cd tosa-serialization/build + ctest run-npy-tests: stage: test - script: - - echo "running npy tests" + needs: ["build-ser-lib"] + dependencies: + - build-ser-lib + variables: + GIT_STRATEGY: none + script: | + cd tosa-serialization + python test/scripts/test_npy_fileio.py run-pytests: stage: test - script: - - echo "running pytests" + needs: ["build-ser-lib"] + dependencies: + - build-ser-lib + variables: + GIT_STRATEGY: none + script: | + cd tosa-serialization + pip3 install flatbuffers==24.3.25 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 + pytest -- GitLab From e34e9a79fd77c6d6009dffe0aa1c9c0a95bc36db Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:27:11 +0100 Subject: [PATCH 15/28] remove incorrect project path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a92df8d..99b9238 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ run-gtest: variables: GIT_STRATEGY: none script: | - cd tosa-serialization/build + cd build ctest run-npy-tests: -- GitLab From 0e51a2917cd2bf1b855327f43cbe99847b0e2427 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:29:18 +0100 Subject: [PATCH 16/28] remove incorrect project paths --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99b9238..36d565e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,6 @@ run-npy-tests: variables: GIT_STRATEGY: none script: | - cd tosa-serialization python test/scripts/test_npy_fileio.py run-pytests: @@ -57,6 +56,5 @@ run-pytests: variables: GIT_STRATEGY: none script: | - cd tosa-serialization pip3 install flatbuffers==24.3.25 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 pytest -- GitLab From 43f670591e894e0835d3169efe58382f3c9deaad Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:41:13 +0100 Subject: [PATCH 17/28] use dedicate group runners --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36d565e..66fcae6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ variables: default: tags: - - amd64-shared + - amd64 build-ser-lib: stage: build @@ -26,7 +26,6 @@ build-ser-lib: make -j $(nproc) - run-gtest: stage: test needs: ["build-ser-lib"] -- GitLab From e0179deda394497bf07e2ad0e54980aebc7153db Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 28 Jul 2025 13:48:52 +0100 Subject: [PATCH 18/28] change image tag to prod --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66fcae6..dd7504b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: registry.gitlab.arm.com/tosa/tosa-serialization:dev +# Pipeline config +image: registry.gitlab.arm.com/tosa/tosa-serialization:prod stages: - build @@ -11,6 +12,7 @@ default: tags: - amd64 +# Jobs build-ser-lib: stage: build artifacts: -- GitLab From a2e723ff73720c9bc69e045a0a6939a8042c93ad Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 16:12:58 +0100 Subject: [PATCH 19/28] remove submodule handling --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd7504b..d534809 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,6 @@ build-ser-lib: - ./ expire_in: 1h script: | - git submodule update --init --recursive mkdir build cd build -- GitLab From 79ed91219fc4de1cb757f5e4e8a09b4f3ab95c60 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 16:19:21 +0100 Subject: [PATCH 20/28] store dev requirements in file --- .gitlab-ci.yml | 2 +- requirements_dev.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 requirements_dev.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d534809..0133fd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,5 +56,5 @@ run-pytests: variables: GIT_STRATEGY: none script: | - pip3 install flatbuffers==24.3.25 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 + pip install -r requirements_dev.txt pytest diff --git a/requirements_dev.txt b/requirements_dev.txt new file mode 100644 index 0000000..e872df8 --- /dev/null +++ b/requirements_dev.txt @@ -0,0 +1,4 @@ +flatbuffers==24.3.25 +numpy==2.1.1 +ml_dtypes==0.5.0 +pytest==8.3.3 \ No newline at end of file -- GitLab From 2d164ab6a29f53ed818ae33fce9ad5ad54f02a74 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 16:23:18 +0100 Subject: [PATCH 21/28] update readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 967c350..b7e4870 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,10 @@ For Microsoft Visual C++ (MSVC) * MSVC build tools (tested with 19.41.34123.0) ##### Install Additional pip Packages (for unit tests) -* flatbuffers (tested with 23.5.26) -* numpy (tested with 2.1.1) -* ml_dtypes (tested with 0.5.0) -* pytest (tested with 8.3.3) Any platform ```bash -pip install flatbuffers==23.5.26 numpy==2.1.1 ml_dtypes==0.5.0 pytest==8.3.3 +pip install -r requirements_dev.txt ``` # Compilation -- GitLab From 340bc17412804aadcdc4818db47cf2bbf91885af Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 16:54:41 +0100 Subject: [PATCH 22/28] create docker build and upload step --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0133fd1..4c817af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: registry.gitlab.arm.com/tosa/tosa-serialization:prod stages: + - docker - build - test @@ -13,6 +14,19 @@ default: - amd64 # Jobs +build-and-upload-image: + image: docker:24.0.5 + stage: docker + services: + - docker:24.0.5-dind + variables: + IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + when: manual + script: + - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin + - docker build -t $IMAGE_TAG . + - docker push $IMAGE_TAG + build-ser-lib: stage: build artifacts: -- GitLab From 0d3d464c43d2eae003d5beb43d9a314ca0ecd6b7 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 17:02:32 +0100 Subject: [PATCH 23/28] add alias for services --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c817af..7988168 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,8 @@ build-and-upload-image: image: docker:24.0.5 stage: docker services: - - docker:24.0.5-dind + - name: docker:24.0.5-dind + alias: docker variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG when: manual -- GitLab From 2210f37f03e718f0bc4858a1e98332813d63999a Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 17:07:10 +0100 Subject: [PATCH 24/28] use env variables for docker build stage --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7988168..bad8980 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,11 @@ build-and-upload-image: image: docker:24.0.5 stage: docker services: - - name: docker:24.0.5-dind - alias: docker + - name: docker:24.0.5-dind variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + DOCKER_HOST: tcp://docker:2375/ + DOCKER_DRIVER: overlay2 when: manual script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin -- GitLab From b75ef4dbe52d712942afce7da344ac8ca7ec964b Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 17:12:45 +0100 Subject: [PATCH 25/28] use port 2376 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bad8980..e7b5f4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ build-and-upload-image: - name: docker:24.0.5-dind variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - DOCKER_HOST: tcp://docker:2375/ + DOCKER_HOST: tcp://docker:2376/ DOCKER_DRIVER: overlay2 when: manual script: -- GitLab From 2a04e8e950af39c68e220961aea8313bdf04d6ce Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Sun, 3 Aug 2025 17:31:43 +0100 Subject: [PATCH 26/28] docker dind debug --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7b5f4a..304faf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,14 +15,12 @@ default: # Jobs build-and-upload-image: - image: docker:24.0.5 + image: docker:latest stage: docker services: - - name: docker:24.0.5-dind + - name: docker:dind variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - DOCKER_HOST: tcp://docker:2376/ - DOCKER_DRIVER: overlay2 when: manual script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin -- GitLab From 58718294e75f20f6bb2b228e2db6e1c10c440540 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 4 Aug 2025 09:10:16 +0100 Subject: [PATCH 27/28] remove image build and upload job --- .gitlab-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 304faf5..0133fd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ image: registry.gitlab.arm.com/tosa/tosa-serialization:prod stages: - - docker - build - test @@ -14,19 +13,6 @@ default: - amd64 # Jobs -build-and-upload-image: - image: docker:latest - stage: docker - services: - - name: docker:dind - variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - when: manual - script: - - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - - docker build -t $IMAGE_TAG . - - docker push $IMAGE_TAG - build-ser-lib: stage: build artifacts: -- GitLab From bbfee880d20fd06770698a3e100e5e7684168179 Mon Sep 17 00:00:00 2001 From: Victor Anaehobi Date: Mon, 4 Aug 2025 09:17:21 +0100 Subject: [PATCH 28/28] remove dependency install step --- .gitlab-ci.yml | 1 - Dockerfile | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0133fd1..f1a08d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,5 +56,4 @@ run-pytests: variables: GIT_STRATEGY: none script: | - pip install -r requirements_dev.txt pytest diff --git a/Dockerfile b/Dockerfile index 5a469d2..ea017ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,4 +33,6 @@ RUN pyenv install 3.12.3 &&\ RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100 &&\ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100 +COPY requirements_dev.txt . +RUN pip install -r requirements_dev.txt CMD [ "/bin/bash" ] \ No newline at end of file -- GitLab