Skip to content

Commit

Permalink
Get rid of the old branch name remnants
Browse files Browse the repository at this point in the history
  • Loading branch information
Haarolean committed Jan 23, 2024
1 parent 6e1597f commit 7b02579
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ body:
required: true
- label: I've searched for an already existing issues [here](https://github.com/kafbat/kafka-ui/issues)
required: true
- label: I've tried running `master`-labeled docker image and the issue still persists there
- label: I've tried running `main`-labeled docker image and the issue still persists there
required: true
- label: I'm running a supported version of the application which is listed [here](https://github.com/kafbat/kafka-ui/blob/master/SECURITY.md)
- label: I'm running a supported version of the application which is listed [here](https://github.com/kafbat/kafka-ui/blob/main/SECURITY.md)
required: true

- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body:
options:
- label: I've searched for an already existing issues [here](https://github.com/kafbat/kafka-ui/issues)
required: true
- label: I'm running a supported version of the application which is listed [here](https://github.com/kafbat/kafka-ui/blob/master/SECURITY.md) and the feature is not present there
- label: I'm running a supported version of the application which is listed [here](https://github.com/kafbat/kafka-ui/blob/main/SECURITY.md) and the feature is not present there
required: true

- type: textarea
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged

Check out [Contributing](https://github.com/kafbat/kafka-ui/blob/master/CONTRIBUTING.md) and [Code of Conduct](https://github.com/kafbat/kafka-ui/blob/master/CODE-OF-CONDUCT.md)
Check out [Contributing](https://github.com/kafbat/kafka-ui/blob/main/CONTRIBUTING.md) and [Code of Conduct](https://github.com/kafbat/kafka-ui/blob/main/CODE-OF-CONDUCT.md)

**A picture of a cute animal (not mandatory but encouraged)**
2 changes: 1 addition & 1 deletion .github/workflows/aws_publisher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
KafkaUIInfraBranch:
description: 'Branch name of Kafka-UI-Infra repo, build commands will be executed from this branch'
required: true
default: 'master'
default: 'main'
KafkaUIReleaseVersion:
description: 'Version of KafkaUI'
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Backend: PR/master build & test"
name: "Backend: PR/main build & test"
on:
push:
branches:
- master
- main
pull_request_target:
types: ["opened", "edited", "reopened", "synchronize"]
paths:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
-Dsonar.pullrequest.branch=$HEAD_REF \
-Dsonar.pullrequest.base=$BASE_REF
- name: Build and analyze push master
- name: Build and analyze push main
if: ${{ github.event_name == 'push' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
paths:
- 'kafka-ui-contract/**'
- 'kafka-ui-react-app/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CVE checks docker master
name: CVE checks docker main
on:
workflow_dispatch:
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Frontend: PR/master build & test"
name: "Frontend: PR/main build & test"
on:
push:
branches:
- master
- main
pull_request_target:
types: ["opened", "edited", "reopened", "synchronize"]
paths:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/master.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: "Master: Build & deploy"
name: "Main: Build & deploy"
on:
workflow_dispatch:
push:
branches: [ "master" ]
branches: [ "main" ]

jobs:
build:
Expand Down Expand Up @@ -58,20 +58,20 @@ jobs:
push: true
tags: |
ghcr.io/kafbat/kafka-ui:${{ steps.build.outputs.version }}
ghcr.io/kafbat/kafka-ui:master
ghcr.io/kafbat/kafka-ui:main
build-args: |
JAR_FILE=kafka-ui-api-${{ steps.build.outputs.version }}.jar
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache
#################################
# #
# Master image digest update #
# Main image digest update #
# #
#################################
- name: update-master-deployment
if: false # TODO remove after infra fix
run: |
git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/kafbat/ui-infra.git --branch master
git clone https://infra-tech:${{ secrets.INFRA_USER_ACCESS_TOKEN }}@github.com/kafbat/ui-infra.git --branch main
cd kafka-ui-infra/aws-infrastructure4eks/argocd/scripts
echo "Image digest is:${{ steps.docker_build_and_push.outputs.digest }}"
./kafka-ui-update-master-digest.sh ${{ steps.docker_build_and_push.outputs.digest }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Infra: Release Drafter run"
on:
push:
branches:
- master
- main
workflow_dispatch:
inputs:
version:
Expand All @@ -12,7 +12,7 @@ on:
branch:
description: 'Target branch'
required: false
default: 'master'
default: 'main'

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#### Versatile, fast and lightweight web UI for managing Apache Kafka® clusters. Built by developers, for developers.
<br/>

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/kafbat/kafka-ui/blob/master/LICENSE)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/kafbat/kafka-ui/blob/main/LICENSE)
![UI for Apache Kafka Price Free](documentation/images/free-open-source.svg)
[![Release version](https://img.shields.io/github/v/release/kafbat/kafka-ui)](https://github.com/kafbat/kafka-ui/releases)
[![Chat with us](https://img.shields.io/discord/897805035122077716)](https://discord.gg/4DWzD7pGE5)
Expand Down

0 comments on commit 7b02579

Please sign in to comment.