From 77f2ee01d6144d16013d84f3b729310823b75dfd Mon Sep 17 00:00:00 2001
From: John Niang <johnniang@fastmail.com>
Date: Thu, 1 Jun 2023 17:03:48 +0800
Subject: [PATCH] Bump up to Halo 2.6.1 (#4027)

---
 .github/workflows/halo.yaml | 12 +++++-------
 README.md                   |  2 +-
 gradle.properties           |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/halo.yaml b/.github/workflows/halo.yaml
index 430c8dbb1..f0a0db9b0 100644
--- a/.github/workflows/halo.yaml
+++ b/.github/workflows/halo.yaml
@@ -3,15 +3,13 @@ name: Halo CI
 on:
   pull_request:
     branches:
-      - main
-      - release-*
+      - release-2.6
     paths:
       - "**"
       - "!**.md"
   push:
     branches:
-      - main
-      - release-*
+      - release-2.6
     paths:
       - "**"
       - "!**.md"
@@ -45,7 +43,7 @@ jobs:
         uses: codecov/codecov-action@v3
       - name: Setup console environment
         if: steps.changes.outputs.console == 'true'
-        uses: halo-sigs/actions/admin-env-setup@main
+        uses: halo-sigs/actions/admin-env-setup@release-2.6
       - name: Check console
         if: steps.changes.outputs.console == 'true'
         run: make -C console check
@@ -54,11 +52,11 @@ jobs:
     needs: check
     steps:
       - uses: actions/checkout@v3
-      - uses: halo-sigs/actions/halo-next-docker-build@main # change the version to specific ref or release tag while the action is stable.
+      - uses: halo-sigs/actions/halo-next-docker-build@release-2.6 # change the version to specific ref or release tag while the action is stable.
         with:
           image-name: ${{ github.event_name == 'release' && 'halo' || 'halo-dev' }}
           ghcr-token: ${{ secrets.GHCR_TOKEN }}
           dockerhub-user: ${{ secrets.DOCKER_USERNAME }}
           dockerhub-token: ${{ secrets.DOCKER_TOKEN }}
           push: ${{ github.event_name == 'push' || github.event_name == 'release' }} # we only push to GHCR if the push is to the next branch
-          console-ref: ${{ github.event_name == 'release' &&  github.ref || 'main' }}
+          console-ref: ${{ github.event_name == 'release' &&  github.ref || 'release-2.6' }}
diff --git a/README.md b/README.md
index 03686ec1c..1ffc3dfa9 100755
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ docker run \
   --name halo \
   -p 8090:8090 \
   -v ~/.halo2:/root/.halo2 \
-  halohub/halo:2.5 \
+  halohub/halo:2.6 \
   --halo.security.initializer.superadminusername=admin \
   --halo.security.initializer.superadminpassword=P@88w0rd
 ```
diff --git a/gradle.properties b/gradle.properties
index f08c9f921..b03d242b3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version=2.6.0-SNAPSHOT
+version=2.6.1-SNAPSHOT
 r2dbc-mysql.version=1.0.2