From 402d9be734372879c7b2bd580cc2b61d591fa7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?= Date: Wed, 10 Apr 2024 14:35:25 +0200 Subject: [PATCH 1/2] Update OTP versions used in CI - Using 26.2.2, because 26.2.3 has some rebar issues (would need to-be-released rebar 3.23) - Using 25.3.2.9, because 25.3.2.10 is not available yet for GH Actions --- .circleci/template.yml | 4 ++-- .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/template.yml b/.circleci/template.yml index 679bc5e6d90..465961babdb 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -1,8 +1,8 @@ version: 2.1 references: - - &OTP25 mongooseim/cimg-erlang:25.3.2.6 - - &OTP26 mongooseim/cimg-erlang:26.1.2 + - &OTP25 mongooseim/cimg-erlang:25.3.2.9 + - &OTP26 mongooseim/cimg-erlang:26.2.2 - &ENTRYPOINT ["/bin/sh", "-c", "eval ${INSTALL_DEPS_CMD:-echo} && echo __INJECT_FILES__ | eval ${BASE32DEC:-base32 --decode} | bash"] # Caches created via the save_cache step are stored for up to 15 days - &CERT_KEY certs-cache-{{ checksum "certs_cache_key" }}-v3 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e712618856a..c8a23d86b73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: ## the full list of supported (prebuilt) OTP versions for ubuntu-22.04 runners ## can be found here: ## https://builds.hex.pm/builds/otp/ubuntu-22.04/builds.txt - otp: [ '25.3.2.6', '26.1.2' ] + otp: [ '25.3.2.9', '26.2.2' ] runs-on: ubuntu-22.04 env: PRESET: 'small_tests' From e2d03e3c22a94b4841606850cd5f6819a8025449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?= Date: Wed, 10 Apr 2024 14:36:39 +0200 Subject: [PATCH 2/2] Update release branch in GH buttons --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 43e23c900a9..ef228a31a43 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # MongooseIM platform [![GitHub release](https://img.shields.io/github/release/esl/MongooseIM.svg)](https://github.com/esl/MongooseIM/releases) -[![CircleCI](https://dl.circleci.com/status-badge/img/gh/esl/MongooseIM/tree/rel-6.1.svg?style=shield)](https://app.circleci.com/pipelines/github/esl/MongooseIM?branch=rel-6.1) -[![Codecov](https://codecov.io/gh/esl/MongooseIM/branch/rel-6.1/graph/badge.svg)](https://app.codecov.io/gh/esl/MongooseIM/tree/rel-6.1) -[![GitHub Actions](https://github.com/esl/MongooseIM/workflows/CI/badge.svg?branch=rel-6.1)](https://github.com/esl/MongooseIM/actions/workflows/ci.yml?query=branch%3Arel-6.1) -[![Coveralls](https://coveralls.io/repos/github/esl/MongooseIM/badge.svg?branch=rel-6.1)](https://coveralls.io/github/esl/MongooseIM?branch=rel-6.1) +[![CircleCI](https://dl.circleci.com/status-badge/img/gh/esl/MongooseIM/tree/rel-6.2.svg?style=shield)](https://app.circleci.com/pipelines/github/esl/MongooseIM?branch=rel-6.2) +[![Codecov](https://codecov.io/gh/esl/MongooseIM/branch/rel-6.2/graph/badge.svg)](https://app.codecov.io/gh/esl/MongooseIM/tree/rel-6.2) +[![GitHub Actions](https://github.com/esl/MongooseIM/workflows/CI/badge.svg?branch=rel-6.2)](https://github.com/esl/MongooseIM/actions/workflows/ci.yml?query=branch%3Arel-6.2) +[![Coveralls](https://coveralls.io/repos/github/esl/MongooseIM/badge.svg?branch=rel-6.2)](https://coveralls.io/github/esl/MongooseIM?branch=rel-6.2) * [Getting started](https://esl.github.io/MongooseDocs/latest/getting-started/Installation/) * [Developer's guide](https://esl.github.io/MongooseDocs/latest/developers-guide/Testing-MongooseIM/)