From 81c18c5ef0a8fa0c37fbf1a9308685d1c2315fa7 Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Thu, 27 Mar 2025 20:22:26 -0400 Subject: [PATCH 1/3] Fixed persisted state can become corrupted when performing `get_and_update` --- mix.lock | 2 +- test/peridiod/binary_test.exs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mix.lock b/mix.lock index b290be3..af8c292 100644 --- a/mix.lock +++ b/mix.lock @@ -22,7 +22,7 @@ "peridio_net_mon": {:git, "https://github.com/peridio/peridio-net-mon.git", "0ce37dd604209441cee325a9f2bd33cc74d1c972", [branch: "main"]}, "peridio_rat": {:git, "https://github.com/peridio/peridio-rat.git", "1028e3d5b07ae8a6b078e1ea56ec24d31d94fd76", [branch: "main"]}, "peridio_sdk": {:git, "https://github.com/peridio/peridio-elixir.git", "f3749b0ecac384f71f554ec3754ace7fe792f874", [branch: "main"]}, - "peridiod_persistence": {:git, "https://github.com/peridio/peridiod-persistence.git", "228628a35cbdb707820fe0e740fccb580ceb0de9", [branch: "main"]}, + "peridiod_persistence": {:git, "https://github.com/peridio/peridiod-persistence.git", "44733e8af532d9bf1acb726d4dc43712de29ad0a", [branch: "main"]}, "plug": {:hex, :plug, "1.16.1", "40c74619c12f82736d2214557dedec2e9762029b2438d6d175c5074c933edc9d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"}, "plug_cowboy": {:hex, :plug_cowboy, "2.7.2", "fdadb973799ae691bf9ecad99125b16625b1c6039999da5fe544d99218e662e4", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "245d8a11ee2306094840c000e8816f0cbed69a23fc0ac2bcf8d7835ae019bb2f"}, "plug_crypto": {:hex, :plug_crypto, "2.1.0", "f44309c2b06d249c27c8d3f65cfe08158ade08418cf540fd4f72d4d6863abb7b", [:mix], [], "hexpm", "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"}, diff --git a/test/peridiod/binary_test.exs b/test/peridiod/binary_test.exs index ebc3e9a..87467a5 100644 --- a/test/peridiod/binary_test.exs +++ b/test/peridiod/binary_test.exs @@ -118,7 +118,7 @@ defmodule Peridiod.BinaryTest do } do binary_metadata = List.first(release_metadata.bundle.binaries) Binary.metadata_to_cache(cache_pid, binary_metadata) - assert {:ok, _contents} = Binary.put_kv_installed(kv_pid, binary_metadata, :progress) + assert :ok = Binary.put_kv_installed(kv_pid, binary_metadata, :progress) kv_installed = Binary.get_all_kv_installed(kv_pid, :progress) id = From 964e1ec01b46f55ba296e673291f361687d6923e Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Thu, 27 Mar 2025 20:23:05 -0400 Subject: [PATCH 2/3] Fix RPMs access to libmnl-devel --- .github/workflows/build_push_release.yml | 2 ++ Containerfile | 2 +- release/Containerfile-build-rhel9 | 2 +- release/Containerfile-test-rhel9 | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_push_release.yml b/.github/workflows/build_push_release.yml index 25fd967..114e92a 100644 --- a/.github/workflows/build_push_release.yml +++ b/.github/workflows/build_push_release.yml @@ -299,12 +299,14 @@ jobs: PERIDIOD_VERSION_RPM=${PERIDIOD_VERSION//-/_} PERIDIOD_PACKAGE_DIR=$(pwd)/package/peridiod_${PERIDIOD_VERSION}_${PERIDIOD_ARCH} PERIDIOD_RELEASE_NOTES=$(sed -e "/^## ${RELEASE_TAG}/,/^## / ! d" CHANGELOG.md | tail -n +2 | head -n -1) + PERIDIOD_DIST_TAG=$(rpm --eval '%{?dist}' | sed 's/^.//') export PERIDIOD_RELEASE_NOTES export PERIDIOD_VERSION export PERIDIOD_VERSION_RPM export PERIDIOD_ARCH export PERIDIOD_ARCH_RPM + export PERIDIOD_DIST_TAG release/build-rpm.sh ./docker_output/peridiod-${PERIDIOD_VERSION}.tar.gz $PERIDIOD_PACKAGE_DIR diff --git a/Containerfile b/Containerfile index 60f7ff7..5bf9b9c 100644 --- a/Containerfile +++ b/Containerfile @@ -58,7 +58,7 @@ RUN fwup -a -t complete -i support/peridiod.fw -d support/peridiod.img RUN mix deps.get --only $MIX_ENV RUN mix release --overwrite -FROM alpine:3.21 as app +FROM alpine:3.21 AS app RUN apk add --no-cache \ agetty \ diff --git a/release/Containerfile-build-rhel9 b/release/Containerfile-build-rhel9 index 06309e0..b570a1f 100644 --- a/release/Containerfile-build-rhel9 +++ b/release/Containerfile-build-rhel9 @@ -5,7 +5,7 @@ ARG ERLANG_VERSION=27.1.3 ARG ELIXIR_VERSION=1.18.3-otp-27 RUN dnf groupinstall -y 'Development Tools' && \ - dnf install -y \ + dnf install -y --enablerepo=crb \ gcc-c++ \ autoconf \ gcc \ diff --git a/release/Containerfile-test-rhel9 b/release/Containerfile-test-rhel9 index cac9456..bc92d53 100644 --- a/release/Containerfile-test-rhel9 +++ b/release/Containerfile-test-rhel9 @@ -3,7 +3,6 @@ FROM rockylinux:9 AS build ARG MIX_ENV=prod ARG ERLANG_VERSION=27.3 ARG ELIXIR_VERSION=1.18.3-otp-27 -ENV DEBIAN_FRONTEND=noninteractive RUN dnf groupinstall -y 'Development Tools' && \ dnf install -y --enablerepo=crb \ From 5ab6c8701fa26f3eba442f433fa07b183c348a36 Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Thu, 27 Mar 2025 20:23:13 -0400 Subject: [PATCH 3/3] v3.1.3 release --- CHANGELOG.md | 5 +++++ VERSION | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e667cce..1d96fb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # peridiod releases +## v3.1.3 + +* Bug fixes + * [Core] Fixed persisted state can become corrupted when performing `get_and_update` + ## v3.1.2 * Bug fixes diff --git a/VERSION b/VERSION index ef538c2..ff365e0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.2 +3.1.3