Skip to content

Commit 2a4a563

Browse files
authored
Merge branch 'main' into broadcast-cla-workflow
2 parents 62dce38 + 58517f9 commit 2a4a563

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+503
-94
lines changed

.github/charts-values-update-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ charts:
1414
- ghcr.io/netcracker/qubership-docker-zookeeper:${release}
1515
- ghcr.io/netcracker/qubership-zookeeper-monitoring:${release}
1616
- ghcr.io/netcracker/qubership-zookeeper-backup-daemon:${release}
17-
- ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
17+
- ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
18+
- ghcr.io/netcracker/qubership-docker-kubectl:#latest

.github/release-drafter-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ version-resolver:
4545
patch:
4646
labels:
4747
- patch
48-
default: patch
48+
default: patch

.github/workflows/automatic-pr-labeler.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ jobs:
2424
if: (github.event.pull_request.merged == false) && (github.event.pull_request.user.login != 'dependabot[bot]') && (github.event.pull_request.user.login != 'github-actions[bot]')
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
28+
with:
29+
persist-credentials: false
2830

2931
- name: "Execute assign labels"
3032
id: action-assign-labels
3133
uses: mauroalderete/action-assign-labels@v1
3234
with:
3335
pull-request-number: ${{ github.event.pull_request.number }}
3436
github-token: ${{ github.token }}
35-
conventional-commits: ".github/workflows/automatic-pr-labeler.yaml"
37+
conventional-commits: "./.github/auto-labeler-config.yaml"
3638
maintain-labels-not-matched: true
3739
apply-changes: ${{ github.event.pull_request.base.repo.id == github.event.pull_request.head.repo.id }}
3840
- name: "Drop warning if PR from fork"
@@ -42,4 +44,4 @@ jobs:
4244
echo "⚠️ Pull request from fork! ⚠️";
4345
echo "Labels will not be applied to PR. Assign them manually please.";
4446
echo "Labels to assign: ${{ steps.action-assign-labels.outputs.labels-next }}";
45-
} >> $GITHUB_STEP_SUMMARY
47+
} >> "$GITHUB_STEP_SUMMARY"

.github/workflows/cla.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ permissions:
1111

1212
jobs:
1313
CLAAssistant:
14+
if: github.event.pull_request.draft == false
1415
permissions:
1516
actions: write
1617
contents: write
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
name: Link Checker
3+
4+
on:
5+
push: null
6+
repository_dispatch: null
7+
workflow_dispatch: null
8+
pull_request:
9+
branches: [main]
10+
types:
11+
[opened, reopened, synchronize]
12+
permissions:
13+
contents: read
14+
jobs:
15+
linkChecker:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
20+
- name: Restore lychee cache
21+
uses: actions/cache@v4
22+
id: restore-cache
23+
with:
24+
path: .lycheecache
25+
key: cache-lychee-${{ github.sha }}
26+
restore-keys: cache-lychee-
27+
28+
- name: Link Checker
29+
id: lychee
30+
uses: lycheeverse/lychee-action@v2
31+
with:
32+
args: >-
33+
'./**/*.md'
34+
--verbose
35+
--no-progress
36+
--user-agent 'Mozilla/5.0 (X11; Linux x86_64) Chrome/134.0.0.0'
37+
--retry-wait-time 60
38+
--max-retries 8
39+
--accept 100..=103,200..=299,429
40+
--cookie-jar cookies.json
41+
--exclude-all-private
42+
--max-concurrency 4
43+
--cache
44+
--cache-exclude-status '429, 500..502'
45+
--max-cache-age 1d
46+
format: markdown
47+
fail: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
3+
name: Conventional Commits PR Check
4+
5+
on:
6+
pull_request:
7+
types:
8+
- opened
9+
- edited
10+
- synchronize
11+
12+
permissions:
13+
pull-requests: read
14+
jobs:
15+
build:
16+
name: Conventional Commits
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
with:
21+
persist-credentials: false
22+
23+
- uses: webiny/action-conventional-commits@v1.3.0
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
3+
name: "Lint PR Title"
4+
5+
on:
6+
pull_request:
7+
types:
8+
- opened
9+
- edited
10+
- synchronize
11+
- reopened
12+
13+
permissions:
14+
pull-requests: read
15+
16+
jobs:
17+
main:
18+
name: Validate PR title
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: amannn/action-semantic-pull-request@v6
22+
env:
23+
GITHUB_TOKEN: ${{ github.token }}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
name: Profanity filter
3+
4+
on:
5+
issue_comment:
6+
types: [created, edited]
7+
issues:
8+
types: [opened, edited, reopened]
9+
pull_request:
10+
types: [opened, edited, reopened]
11+
12+
permissions:
13+
issues: write
14+
pull-requests: write
15+
16+
jobs:
17+
apply-filter:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Scan issue or pull request for profanity
21+
# Conditionally run the step if the actor isn't a bot
22+
if: ${{ github.actor != 'dependabot[bot]' && github.actor != 'github-actions[bot]' }}
23+
uses: IEvangelist/profanity-filter@9.07
24+
id: profanity-filter
25+
with:
26+
token: ${{ secrets.GITHUB_TOKEN }}
27+
# See https://bit.ly/potty-mouth-replacement-strategies
28+
replacement-strategy: middle-asterisk # See Replacement strategy
29+
custom-profane-words-url: https://github.com/Hesham-Elbadawi/list-of-banned-words/raw/refs/heads/master/ru

.github/workflows/push.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ on:
2727
- 'README.md'
2828
- 'SECURITY.md'
2929

30+
env:
31+
TAG_NAME: ${{ github.event.release.tag_name || github.ref }}
32+
GITHUB_GROUP: ${{ github.repository_owner }}
33+
3034
concurrency:
3135
# On main/release, we don't want any jobs cancelled so the sha is used to name the group
3236
# On PR branches, we cancel the job if new commits are pushed
@@ -60,19 +64,9 @@ jobs:
6064
file: docker-zookeeper/docker/Dockerfile
6165
context: docker-zookeeper
6266
runs-on: ubuntu-latest
63-
name: ${{ matrix.component.name }}
6467
steps:
6568
- name: Checkout
6669
uses: actions/checkout@v4
67-
- name: Docker meta
68-
id: meta
69-
uses: docker/metadata-action@v5
70-
with:
71-
images: |
72-
ghcr.io/${{ github.repository_owner }}/${{ matrix.component.name }}
73-
tags: |
74-
type=ref,event=branch
75-
type=ref,event=tag
7670
- name: Set up QEMU
7771
uses: docker/setup-qemu-action@v3
7872
- name: Set up Docker Buildx
@@ -81,14 +75,18 @@ jobs:
8175
uses: docker/login-action@v3
8276
with:
8377
registry: ghcr.io
84-
username: ${{ github.actor }}
85-
password: ${{ secrets.GITHUB_TOKEN }}
78+
username: ${GITHUB_ACTOR}
79+
password: ${{secrets.GITHUB_TOKEN}}
80+
- name: Prepare Tag
81+
run: echo "TAG_NAME=$(echo ${TAG_NAME} | sed 's@refs/tags/@@;s@refs/heads/@@;s@/@_@g')" >> $GITHUB_ENV
82+
- name: Prepare Group
83+
run: echo "GITHUB_GROUP=${GITHUB_GROUP,,}" >> $GITHUB_ENV
8684
- name: Get package IDs for delete
8785
id: get-ids-for-delete
8886
uses: Netcracker/get-package-ids@v0.0.1
8987
with:
9088
component-name: ${{ matrix.component.name }}
91-
component-tag: ${{ steps.meta.outputs.tags }}
89+
component-tag: ${{ env.TAG_NAME }}
9290
access-token: ${{ secrets.GITHUB_TOKEN }}
9391
- name: Build and push
9492
uses: docker/build-push-action@v6
@@ -97,8 +95,6 @@ jobs:
9795
context: ${{ matrix.component.context }}
9896
file: ${{ matrix.component.file }}
9997
platforms: linux/amd64,linux/arm64
100-
# See https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#fetching-metadata-about-a-pull-request
10198
push: ${{ github.event_name != 'pull_request' && github.actor != 'dependabot[bot]' }}
102-
provenance: false
103-
tags: ${{ steps.meta.outputs.tags }}
104-
labels: ${{ steps.meta.outputs.labels }}
99+
tags: ghcr.io/${{ env.GITHUB_GROUP }}/${{ matrix.component.name }}:${{ env.TAG_NAME }}
100+
provenance: false

.github/workflows/run_tests.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ on:
88

99
jobs:
1010
Zookeeper-Pipeline:
11-
if: github.event.pull_request.user.login != 'dependabot[bot]'
12-
uses: Netcracker/qubership-test-pipelines/.github/workflows/zookeeper.yaml@f6104d86e08ccf5c490e8dc6396b51585d03538a
11+
uses: Netcracker/qubership-test-pipelines/.github/workflows/zookeeper.yaml@80631034d5b75e978dfb4fdd300ec729b9e86ab4
1312
with:
1413
service_branch: '${{ github.head_ref || github.ref_name }}'
1514
versions_file: '.github/versions.yaml'
16-
pipeline_branch: 'f6104d86e08ccf5c490e8dc6396b51585d03538a' #this value must match the value after '@' in 'uses'
15+
pipeline_branch: '80631034d5b75e978dfb4fdd300ec729b9e86ab4' #this value must match the value after '@' in 'uses'
1716
secrets:
1817
AWS_S3_ACCESS_KEY_ID: ${{secrets.AWS_S3_ACCESS_KEY_ID}}
1918
AWS_S3_ACCESS_KEY_SECRET: ${{secrets.AWS_S3_ACCESS_KEY_SECRET}}

0 commit comments

Comments
 (0)