Skip to content

Commit

Permalink
Merge branch 'main' into CN-1421
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/modules/ROOT/nav.adoc
  • Loading branch information
kutluhanmetin committed Nov 28, 2024
2 parents ded596c + 3030916 commit 05bcbe3
Show file tree
Hide file tree
Showing 24 changed files with 3,202 additions and 369 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
28 changes: 0 additions & 28 deletions .github/workflows/action-updater.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/backport-starting-v511.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Backport changes starting from 5.11 branch
on:
push:
branches:
- main
jobs:
backport:
strategy:
fail-fast: false
matrix:
branch: ['v/5.11','v/5.12','v/5.13','v/5.14']
uses: hazelcast/hz-docs/.github/workflows/backport-workflow.yml@main
with:
label-to-check-for: '["backport starting from 5.11"]'
target-branch: v/${{ matrix.branch }}
secrets: inherit
40 changes: 0 additions & 40 deletions .github/workflows/backport-v511.yml

This file was deleted.

56 changes: 26 additions & 30 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,33 @@ on:
branches:
- main
jobs:
backport:
strategy:
matrix:
branch: ['v/5.8', 'v/5.9', 'v/5.10']
get-maintenance-branches:
runs-on: ubuntu-latest
outputs:
branches: "['5.8', '5.9', '5.10', '5.11', '5.12', '5.13', '5.14']"
steps:

- name: checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- run: exit 0

- name: Set up git config
run: |
git config user.name "GitHub Actions Bot"
git config user.email "<>"
- name: Check PR for backport label
id: check_pr_labels
uses: shioyang/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
labels: '["backport"]'

- name: See result
run: echo "${{ steps.check_pr_labels.outputs.result }}"
backport-to-all-branch:
needs: get-maintenance-branches
strategy:
fail-fast: false
matrix:
branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }}
uses: hazelcast/hz-docs/.github/workflows/backport-workflow.yml@main
with:
label-to-check-for: '["backport to all versions"]'
target-branch: v/${{ matrix.branch }}
secrets: inherit

- name: Checkout maintenance branch and cherry-pick
if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
run: |
git fetch
git checkout ${{ matrix.branch }}
git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
git push
backport-to-specified-branch:
needs: get-maintenance-branches
strategy:
fail-fast: false
matrix:
branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }}
uses: hazelcast/hz-docs/.github/workflows/backport-workflow.yml@main
with:
label-to-check-for: '["backport to ${{ matrix.branch }}"]'
target-branch: v/${{ matrix.branch }}
secrets: inherit
12 changes: 4 additions & 8 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- name: Check for broken internal links
run: |
npm i
npm run-script check-links-local
- name: Checkout Current Repo
uses: actions/checkout@v4
- name: Check dead links
uses: hazelcast/hazelcast-docs/.github/actions/validate@main
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
/build/
.idea
.DS_Store
package-lock.json
.vscode
162 changes: 0 additions & 162 deletions check-links-playbook.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/modules/ROOT/examples/wan-sync-delta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
kind: Map
targetClusterName: dev
endpoints: "35.192.33.252"
synConsistencyCheckStrategy: "MERKLE_TREES"
syncConsistencyCheckStrategy: "MERKLE_TREES"
---
apiVersion: hazelcast.com/v1alpha1
kind: WanSync
Expand Down
Binary file added docs/modules/ROOT/images/ask_ai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/modules/ROOT/images/ask_ai_search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 05bcbe3

Please sign in to comment.