From a32b1a210ec99533faf44fddb6b13568226440b0 Mon Sep 17 00:00:00 2001 From: adamiBs Date: Thu, 5 Jun 2025 10:11:52 +0300 Subject: [PATCH 1/4] Add callable workflow option --- .github/workflows/pre-merge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 79ce49c6..8cbc5461 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -4,6 +4,7 @@ on: branches: - master - release/* + workflow_call: jobs: build-and-test: @@ -37,6 +38,8 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + with: + ref: unstable - uses: ./.github/actions/build-and-tag-locally with: distribution: ${{ matrix.distribution }} From 48b0173e5901176063f3c708ba8ea2fc61f7abc6 Mon Sep 17 00:00:00 2001 From: adamiBs Date: Sat, 5 Jul 2025 15:15:04 +0300 Subject: [PATCH 2/4] Update Redis to 8.2-rc1 and add push trigger for release/8.2 - Update Redis version from 8.2-m01 to 8.2-rc1 in both Alpine and Debian Dockerfiles - Update SHA256 hash for the new Redis 8.2-rc1 release tag - Add push trigger for release/8.2 branch in GitHub Actions workflow - Add callable workflow option for flexibility --- .github/workflows/pre-merge.yml | 3 +++ alpine/Dockerfile | 4 ++-- debian/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 8cbc5461..9284376b 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -4,6 +4,9 @@ on: branches: - master - release/* + push: + branches: + - release/8.2 workflow_call: jobs: diff --git a/alpine/Dockerfile b/alpine/Dockerfile index b3f63972..fffe2f9a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -14,8 +14,8 @@ RUN set -eux; \ # we need setpriv package as busybox provides very limited functionality setpriv \ ; -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.2-m01.tar.gz -ENV REDIS_DOWNLOAD_SHA=0a1d5a27dd9cb13d51bcaba6546dd54b529774ede5d8993fce5c3ac2bace0f72 +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.2-rc1.tar.gz +ENV REDIS_DOWNLOAD_SHA=563adfc7dc5384a05cdf1ee2059cfe4ad50ee311b67b5793ecf7a915ef4a27b9 RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ diff --git a/debian/Dockerfile b/debian/Dockerfile index ab55b764..3868cae9 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -14,8 +14,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.2-m01.tar.gz -ENV REDIS_DOWNLOAD_SHA=0a1d5a27dd9cb13d51bcaba6546dd54b529774ede5d8993fce5c3ac2bace0f72 +ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.2-rc1.tar.gz +ENV REDIS_DOWNLOAD_SHA=563adfc7dc5384a05cdf1ee2059cfe4ad50ee311b67b5793ecf7a915ef4a27b9 RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ From c3c897a4cd6253dc6056126b8a94fd73675974f1 Mon Sep 17 00:00:00 2001 From: adamiBs Date: Sat, 5 Jul 2025 15:19:49 +0300 Subject: [PATCH 3/4] Remove ref unstable --- .github/workflows/pre-merge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 9284376b..94dee557 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -41,8 +41,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - with: - ref: unstable - uses: ./.github/actions/build-and-tag-locally with: distribution: ${{ matrix.distribution }} From 0f8af07dfadee5dba49eff92914ff974da9c142b Mon Sep 17 00:00:00 2001 From: adamiBs Date: Sat, 5 Jul 2025 15:20:30 +0300 Subject: [PATCH 4/4] Cleanup of CI --- .github/workflows/pre-merge.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml index 94dee557..79ce49c6 100644 --- a/.github/workflows/pre-merge.yml +++ b/.github/workflows/pre-merge.yml @@ -4,10 +4,6 @@ on: branches: - master - release/* - push: - branches: - - release/8.2 - workflow_call: jobs: build-and-test: