From 67e388b93bf32fb7190e51718314af7bc88258c9 Mon Sep 17 00:00:00 2001 From: Dincho Todorov Date: Fri, 13 Jan 2023 08:51:54 +0200 Subject: [PATCH 1/5] Bump macos CI builder version --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 18d0059..81e13c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,9 +4,9 @@ executors: ubuntu_1804: docker: - image: circleci/buildpack-deps:bionic - macos_1013: + macos_1106: macos: - xcode: "10.0.0" + xcode: "13.2.1" commands: setup_ubuntu: @@ -74,14 +74,14 @@ jobs: - setup_ubuntu: OTP_VERSION: "21.0" - run_build - macos_1013_otp20: - executor: macos_1013 + macos_1106_otp20: + executor: macos_1106 steps: - checkout - setup_macos - run_build - macos_1013_otp21: - executor: macos_1013 + macos_1106_otp21: + executor: macos_1106 steps: - checkout - setup_macos: @@ -93,5 +93,5 @@ workflows: jobs: - ubuntu_1804_otp20 - ubuntu_1804_otp21 - - macos_1013_otp20 - - macos_1013_otp21 + - macos_1106_otp20 + - macos_1106_otp21 From 18cc173e9918db75dd0f204c9355fcd5f20e8d55 Mon Sep 17 00:00:00 2001 From: Dincho Todorov Date: Fri, 13 Jan 2023 09:13:34 +0200 Subject: [PATCH 2/5] Replace OTP 20 builds with OTP 22 --- .circleci/config.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81e13c4..1fee49f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,6 @@ commands: parameters: OTP_VERSION: type: string - default: "20.3.8.23" steps: - run: name: Setup environment @@ -43,7 +42,6 @@ commands: parameters: OTP_VERSION: type: string - default: "20" steps: - run: name: Setup environment @@ -61,24 +59,19 @@ commands: make jobs: - ubuntu_1804_otp20: - executor: ubuntu_1804 - steps: - - checkout - - setup_ubuntu - - run_build ubuntu_1804_otp21: executor: ubuntu_1804 steps: - checkout - setup_ubuntu: - OTP_VERSION: "21.0" + OTP_VERSION: "21.3.8.24" - run_build - macos_1106_otp20: - executor: macos_1106 + ubuntu_1804_otp22: + executor: ubuntu_1804 steps: - checkout - - setup_macos + - setup_ubuntu: + OTP_VERSION: "22.3.4.26" - run_build macos_1106_otp21: executor: macos_1106 @@ -87,11 +80,18 @@ jobs: - setup_macos: OTP_VERSION: "21" - run_build + macos_1106_otp22: + executor: macos_1106 + steps: + - checkout + - setup_macos: + OTP_VERSION: "22" + - run_build workflows: check: jobs: - - ubuntu_1804_otp20 - ubuntu_1804_otp21 - - macos_1106_otp20 + - ubuntu_1804_otp22 - macos_1106_otp21 + - macos_1106_otp22 From ef40fd3a3e26c6725268807920bf93ed8076a2f3 Mon Sep 17 00:00:00 2001 From: Dincho Todorov Date: Fri, 13 Jan 2023 09:42:37 +0200 Subject: [PATCH 3/5] Add OTP 23 builds --- .circleci/config.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1fee49f..321a886 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,6 +73,13 @@ jobs: - setup_ubuntu: OTP_VERSION: "22.3.4.26" - run_build + ubuntu_1804_otp23: + executor: ubuntu_1804 + steps: + - checkout + - setup_ubuntu: + OTP_VERSION: "23.3.4.18" + - run_build macos_1106_otp21: executor: macos_1106 steps: @@ -87,11 +94,20 @@ jobs: - setup_macos: OTP_VERSION: "22" - run_build + macos_1106_otp22: + executor: macos_1106 + steps: + - checkout + - setup_macos: + OTP_VERSION: "23" + - run_build workflows: check: jobs: - ubuntu_1804_otp21 - ubuntu_1804_otp22 + - ubuntu_1804_otp23 - macos_1106_otp21 - macos_1106_otp22 + - macos_1106_otp23 From f8eea1e56582d0d59d3eb9051e8a092dbfe5da41 Mon Sep 17 00:00:00 2001 From: Dincho Todorov Date: Fri, 13 Jan 2023 09:56:18 +0200 Subject: [PATCH 4/5] Fix duplicate job --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 321a886..1ca90c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,7 +94,7 @@ jobs: - setup_macos: OTP_VERSION: "22" - run_build - macos_1106_otp22: + macos_1106_otp23: executor: macos_1106 steps: - checkout From 93c0a668c7da715569337050cc84c5956bf8bf85 Mon Sep 17 00:00:00 2001 From: Dincho Todorov Date: Fri, 13 Jan 2023 09:56:53 +0200 Subject: [PATCH 5/5] Use Ubuntu 20.04 for build jobs --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ca90c7..7214113 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,9 @@ version: 2.1 executors: - ubuntu_1804: + ubuntu_2004: docker: - - image: circleci/buildpack-deps:bionic + - image: circleci/buildpack-deps:20.04 macos_1106: macos: xcode: "13.2.1" @@ -59,22 +59,22 @@ commands: make jobs: - ubuntu_1804_otp21: - executor: ubuntu_1804 + ubuntu_2004_otp21: + executor: ubuntu_2004 steps: - checkout - setup_ubuntu: OTP_VERSION: "21.3.8.24" - run_build - ubuntu_1804_otp22: - executor: ubuntu_1804 + ubuntu_2004_otp22: + executor: ubuntu_2004 steps: - checkout - setup_ubuntu: OTP_VERSION: "22.3.4.26" - run_build - ubuntu_1804_otp23: - executor: ubuntu_1804 + ubuntu_2004_otp23: + executor: ubuntu_2004 steps: - checkout - setup_ubuntu: @@ -105,9 +105,9 @@ jobs: workflows: check: jobs: - - ubuntu_1804_otp21 - - ubuntu_1804_otp22 - - ubuntu_1804_otp23 + - ubuntu_2004_otp21 + - ubuntu_2004_otp22 + - ubuntu_2004_otp23 - macos_1106_otp21 - macos_1106_otp22 - macos_1106_otp23