diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 22a2881785..d798db3aeb 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - ref: 1.0.25-release + ref: 1.0.26-release - name: merge commits from main to release branch run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e858a3036..a50c948704 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,11 +4,11 @@ name: CI on: push: - branches: [ main, 1.0.24-release, 1.0.25-release ] + branches: [ main, 1.0.26-release, 1.0.25-release ] pull_request: - branches: [ main, 1.0.24-release, 1.0.25-release ] + branches: [ main, 1.0.26-release, 1.0.25-release ] workflow_dispatch: - branches: [ main, 1.0.24-release, 1.0.25-release ] + branches: [ main, 1.0.26-release, 1.0.25-release ] jobs: build-and-test: