Release 1.37.4

Merge pull request #221 from nerg4l/fix/make-ubuntu-arm64
fix: use correct repository on arm64 ubuntu image
2024-01-29 10:10:11 -05:00 · 2024-01-29 10:05:52 -05:00 · 2024-01-29 08:31:26 -05:00 · 2024-01-29 08:31:08 -05:00 · 2024-01-10 15:31:32 +00:00 · 2023-12-19 00:23:44 -05:00
5 changed files with 11 additions and 6 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:

      - run: make test

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: tmp/test-results
@@ -93,7 +93,7 @@ jobs:

      - run: make test

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        if: failure()
        with:
          name: tmp/test-results
--- a/2
+++ b/2
@@ -1 +1 @@
-FROM redis:7.2.3
+FROM redis:7.2.4
--- a/7
+++ b/7
@@ -1,5 +1,6 @@
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
+ARCH = $(shell dpkg --print-architecture)
 SHFMT_VERSION = 3.0.2
 XUNIT_TO_GITHUB_VERSION = 0.3.0
 XUNIT_READER_VERSION = 0.1.0
@@ -21,7 +22,11 @@ ifneq ($(shell shellcheck --version >/dev/null 2>&1 ; echo $$?),0)
 ifeq ($(SYSTEM_NAME),darwin)
 	brew install shellcheck
 else
-	sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse'
+ifeq ($(ARCH),arm64)
+  sudo add-apt-repository 'deb http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse'
+else
+  sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse'
+endif
 	sudo rm -rf /var/lib/apt/lists/* && sudo apt-get clean
 	sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck
 endif
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # dokku redis [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-redis/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-redis/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku)

-Official redis plugin for dokku. Currently defaults to installing [redis 7.2.3](https://hub.docker.com/_/redis/).
+Official redis plugin for dokku. Currently defaults to installing [redis 7.2.4](https://hub.docker.com/_/redis/).

 ## Requirements

--- a/plugin.toml
+++ b/plugin.toml
@@ -1,4 +1,4 @@
 [plugin]
 description = "dokku redis service plugin"
-version = "1.37.2"
+version = "1.37.4"
 [plugin.config]
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	c3a6e3af3c	Release 1.37.4 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2024-01-29 10:10:11 -05:00
Jose Diaz-Gonzalez	14c0a11f3a	Merge pull request #221 from nerg4l/fix/make-ubuntu-arm64 fix: use correct repository on arm64 ubuntu image	2024-01-29 10:05:52 -05:00
Jose Diaz-Gonzalez	944329c818	Release 1.37.3 Some checks failed tagged-release / tagged-release (push) Has been cancelled Details	2024-01-29 08:31:26 -05:00
Jose Diaz-Gonzalez	b942ff35f0	Merge pull request #231 from dokku/dependabot/docker/redis-7.2.4 chore(deps): bump redis from 7.2.3 to 7.2.4	2024-01-29 08:31:08 -05:00
dependabot[bot]	4425dc2f29	chore(deps): bump redis from 7.2.3 to 7.2.4 Bumps redis from 7.2.3 to 7.2.4. --- updated-dependencies: - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-10 15:31:32 +00:00
Jose Diaz-Gonzalez	2295773982	Merge pull request #230 from dokku/dependabot/github_actions/actions/upload-artifact-4 chore(deps): bump actions/upload-artifact from 3 to 4	2023-12-19 00:23:44 -05:00
dependabot[bot]	20c92de6c7	chore(deps): bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2023-12-15 15:20:29 +00:00
László GÖRÖG	d90f3bb02a	Merge branch 'master' into fix/make-ubuntu-arm64	2023-12-10 10:22:06 +01:00
László GÖRÖG	3ad35ef009	fix: use correct repository on arm64 ubuntu image	2023-08-07 17:37:30 +02:00