From eeb6aff24267ef4ad6703dddc3d659418d011a2f Mon Sep 17 00:00:00 2001 From: Ulf Wiger Date: Thu, 5 Oct 2023 11:00:49 +0200 Subject: [PATCH 1/4] Run multiple OTP vsns in CI --- .circleci/config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 855d6d7..c73d244 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,6 +2,12 @@ version: 2.1 executors: aebuilder: + docker: + - image: aeternity/builder:bionic-otp24 + user: builder + environment: + ERLANG_ROCKSDB_BUILDOPTS: "-j2" + aebuilder23: docker: - image: aeternity/builder:bionic-otp23 user: builder @@ -14,3 +20,12 @@ jobs: steps: - checkout - run: make test + - store_artifacts: + path: _build/test/logs + build-otp23: + executor: aebuilder23 + steps: + - checkout + - run: make test + - store_artifacts: + path: _build/test/logs From 4d0a78612ac0c4281368c6fb33858cb6839c0c4b Mon Sep 17 00:00:00 2001 From: Ulf Wiger Date: Thu, 5 Oct 2023 11:08:12 +0200 Subject: [PATCH 2/4] Fix ci config --- .circleci/config.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c73d244..a093bec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,17 +15,19 @@ executors: ERLANG_ROCKSDB_BUILDOPTS: "-j2" jobs: - build: - executor: aebuilder - steps: - - checkout - - run: make test - - store_artifacts: - path: _build/test/logs - build-otp23: - executor: aebuilder23 - steps: - - checkout - - run: make test - - store_artifacts: - path: _build/test/logs + - otp24 + build: + executor: aebuilder + steps: + - checkout + - run: make test + - store_artifacts: + path: _build/test/logs + - otp23 + build: + executor: aebuilder23 + steps: + - checkout + - run: make test + - store_artifacts: + path: _build/test/logs From e76a01f8c41ef4c56c0f6eebd66059d29e2b6ebc Mon Sep 17 00:00:00 2001 From: Ulf Wiger Date: Thu, 5 Oct 2023 11:12:32 +0200 Subject: [PATCH 3/4] add ci workflow --- .circleci/config.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a093bec..e8d9de3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ executors: ERLANG_ROCKSDB_BUILDOPTS: "-j2" jobs: - - otp24 + otp24: build: executor: aebuilder steps: @@ -23,7 +23,7 @@ jobs: - run: make test - store_artifacts: path: _build/test/logs - - otp23 + otp23: build: executor: aebuilder23 steps: @@ -31,3 +31,9 @@ jobs: - run: make test - store_artifacts: path: _build/test/logs + +workflows: + build_and_test: + jobs: + - otp23 + - otp24 From 2e430fc5eb8e304845d9281e2d58942eaaa8af6b Mon Sep 17 00:00:00 2001 From: Ulf Wiger Date: Thu, 5 Oct 2023 11:21:03 +0200 Subject: [PATCH 4/4] remove 'build' sublevel --- .circleci/config.yml | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8d9de3..9b3768d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,21 +16,19 @@ executors: jobs: otp24: - build: - executor: aebuilder - steps: - - checkout - - run: make test - - store_artifacts: - path: _build/test/logs + executor: aebuilder + steps: + - checkout + - run: make test + - store_artifacts: + path: _build/test/logs otp23: - build: - executor: aebuilder23 - steps: - - checkout - - run: make test - - store_artifacts: - path: _build/test/logs + executor: aebuilder23 + steps: + - checkout + - run: make test + - store_artifacts: + path: _build/test/logs workflows: build_and_test: