github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump up to Halo 2.6.1 (#4027)

pull/4035/head
John Niang 2023-06-01 17:03:48 +08:00 committed by GitHub
parent 65b27eed6c
commit 77f2ee01d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/halo.yaml vendored
View File

@ -3,15 +3,13 @@ name: Halo CI
on: on:
pull_request: pull_request:
branches: branches:
- main - release-2.6
- release-*
paths: paths:
- "**" - "**"
- "!**.md" - "!**.md"
push: push:
branches: branches:
- main - release-2.6
- release-*
paths: paths:
- "**" - "**"
- "!**.md" - "!**.md"
@ -45,7 +43,7 @@ jobs:
uses: codecov/codecov-action@v3 uses: codecov/codecov-action@v3
- name: Setup console environment - name: Setup console environment
if: steps.changes.outputs.console == 'true' 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 - name: Check console
if: steps.changes.outputs.console == 'true' if: steps.changes.outputs.console == 'true'
run: make -C console check run: make -C console check
@ -54,11 +52,11 @@ jobs:
needs: check needs: check
steps: steps:
- uses: actions/checkout@v3 - 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: with:
image-name: ${{ github.event_name == 'release' && 'halo' || 'halo-dev' }} image-name: ${{ github.event_name == 'release' && 'halo' || 'halo-dev' }}
ghcr-token: ${{ secrets.GHCR_TOKEN }} ghcr-token: ${{ secrets.GHCR_TOKEN }}
dockerhub-user: ${{ secrets.DOCKER_USERNAME }} dockerhub-user: ${{ secrets.DOCKER_USERNAME }}
dockerhub-token: ${{ secrets.DOCKER_TOKEN }} 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 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' }}

2
README.md
View File

@ -30,7 +30,7 @@ docker run \
--name halo \ --name halo \
-p 8090:8090 \ -p 8090:8090 \
-v ~/.halo2:/root/.halo2 \ -v ~/.halo2:/root/.halo2 \
halohub/halo:2.5 \ halohub/halo:2.6 \
--halo.security.initializer.superadminusername=admin \ --halo.security.initializer.superadminusername=admin \
--halo.security.initializer.superadminpassword=P@88w0rd --halo.security.initializer.superadminpassword=P@88w0rd
``` ```

2
gradle.properties
View File

@ -1,2 +1,2 @@
version=2.6.0-SNAPSHOT version=2.6.1-SNAPSHOT
r2dbc-mysql.version=1.0.2 r2dbc-mysql.version=1.0.2