From 46ecb22251b9374f3894647c870ac3b718e3f386 Mon Sep 17 00:00:00 2001 From: Vincent Degove Date: Tue, 19 Mar 2024 15:45:49 +0100 Subject: [PATCH] Update to OTP26 --- .github/workflows/docker.yml | 5 +++-- README.md | 2 +- transport-site/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f76ffca..2690e8d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,8 +20,9 @@ env: IMAGE_NAME: ${{ github.repository }} TEST_TAG: ${{ github.repository }}:test TEST_EXPECTED_NODE_OUTPUT: "v20.11.1" - TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.16.2 (compiled with Erlang/OTP 25)" - TEST_EXPECTED_ERLANG_OUTPUT: "25.3.2.10" + # In transport-site: elixir -v + TEST_EXPECTED_ELIXIR_OUTPUT: "Elixir 1.16.2 (compiled with Erlang/OTP 26)" + TEST_EXPECTED_ERLANG_OUTPUT: "25.2.3" jobs: build-and-push-image: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 2711fad..b6e9d7e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Scripts and config files for provision and deploy transport and required service # New release process (GitHub actions + GitHub Container Registry) To create a new release as a Docker image: -1. Update the code (Dockerfile and Github workflow tests), create a pull request, get your changes merged into master +1. Update the code (Dockerfile and Github workflow tests), create a pull request, get your changes merged into master. No need to test your code locally: you can rely on Github workflow. 2. Create a GitHub release (with tag name == release name), with a changelog on the page https://github.com/etalab/transport-ops/releases 1. Use locally `rake get_image_version` to generate the correct tag / release name 2. Then create a release using this generated name as both the tag and the release title. You can auto-generate the release notes. diff --git a/transport-site/Dockerfile b/transport-site/Dockerfile index 412775d..e70f817 100644 --- a/transport-site/Dockerfile +++ b/transport-site/Dockerfile @@ -21,7 +21,7 @@ FROM ghcr.io/etalab/transport-tools:v1.0.7 as transport-tools # So again, to upgrade this, check out : # # https://hub.docker.com/r/hexpm/elixir -FROM hexpm/elixir:1.16.2-erlang-25.3.2.10-ubuntu-focal-20240123 +FROM hexpm/elixir:1.16.2-erlang-26.2.3-ubuntu-focal-20240123 ARG DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris