Skip to content

Commit

Permalink
prep for 1.5 release (#1089)
Browse files Browse the repository at this point in the history
* prep for 1.5 release

* update dashboards

* force build to test

* fix gha

* revert ff comment

* roll back OTP version

* fix ff

* fix build

* clarify arm runner status

---------

Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com>
  • Loading branch information
austinlparker and cartersocha authored Sep 13, 2023
1 parent 44f100c commit 0c8fa77
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


# Images
IMAGE_VERSION=1.4.0
IMAGE_VERSION=1.5.0
IMAGE_NAME=ghcr.io/open-telemetry/demo

# Demo Platform
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,13 @@ jobs:
- file: ./src/emailservice/Dockerfile
tag_suffix: emailservice
context: ./src/emailservice
# TODO: https://github.com/open-telemetry/opentelemetry-demo/issues/956
# - file: ./src/featureflagservice/Dockerfile
# tag_suffix: featureflagservice
# context: ./
# NOTE:
# https://github.com/open-telemetry/opentelemetry-demo/issues/956
# Until dedicated ARM runners are available for GHA we cannot upgrade
# OTP/Elixir versions. Please do not change the OTP/Elixir versions.
- file: ./src/featureflagservice/Dockerfile
tag_suffix: featureflagservice
context: ./
- file: ./src/frontend/Dockerfile
tag_suffix: frontend
context: ./
Expand Down Expand Up @@ -106,14 +109,14 @@ jobs:
FILES_CHANGED=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- $DOCKERFILE_DIR)
if [ -z "$FILES_CHANGED" ]; then
echo "No changes in ${{ matrix.file_tag.context }}, skipping build."
echo "skip=true >> $GITHUB_OUTPUT"
echo "skip=true" >> "$GITHUB_OUTPUT"
else
echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build."
echo "skip=false >> $GITHUB_OUTPUT"
echo "skip=false" >> "$GITHUB_OUTPUT"
fi
- name: Override skip for push
if: ${{ inputs.push }}
run: echo "skip=false >> $GITHUB_OUTPUT"
run: echo "skip=false" >> "$GITHUB_OUTPUT"
id: override_skip
- name: Log in to the Container registry
uses: docker/login-action@v2
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ release.

## Unreleased

## 1.5.0

* update trace-based tests to test stream events
([#1072](https://github.com/open-telemetry/opentelemetry-demo/pull/1072))
* Add cartServiceFailure feature flag triggering Cart Service errors
Expand Down
12 changes: 7 additions & 5 deletions src/featureflagservice/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
# - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image
# - https://pkgs.org/ - resource for finding needed packages
# - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim
#
ARG ELIXIR_VERSION=1.15.4
ARG OTP_VERSION=26.0.2
ARG DEBIAN_VERSION=buster-20230612-slim
# DO NOT CHANGE ELIXIR OR OTP OR DEBIAN VERSION OR IT WILL BREAK GHA BUILD
# Once there are ARM runners for GHA we can upgrade this.
# Not until then.
ARG ELIXIR_VERSION=1.14.3
ARG OTP_VERSION=23.3.4.14
ARG DEBIAN_VERSION=buster-20210902-slim

ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
Expand All @@ -35,7 +37,7 @@ WORKDIR /app
# install hex + rebar
RUN mix local.hex --force --verbose
RUN mix local.rebar --force --verbose
RUN wget https://s3.amazonaws.com/rebar3/rebar3 && chmod +x rebar3 && mv rebar3 ~/.mix
RUN wget https://github.com/erlang/rebar3/releases/download/3.20.0/rebar3 && chmod +x rebar3 && mv rebar3 ~/.mix
RUN wget https://github.com/rebar/rebar/wiki/rebar && chmod +x rebar && mv rebar ~/.mix
RUN mix archive.install github hexpm/hex branch latest --force

Expand Down
2 changes: 1 addition & 1 deletion src/featureflagservice/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defmodule Featureflagservice.MixProject do
[
app: :featureflagservice,
version: "1.4.0",
elixir: "~> 1.15",
elixir: "~> 1.14",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [] ++ Mix.compilers(),
start_permanent: Mix.env() == :prod,
Expand Down

0 comments on commit 0c8fa77

Please sign in to comment.