Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename master to main #2158

Merged
merged 1 commit into from
Jun 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

1. Read our CONTRIBUTING.md guide
2. Name your PR as `<Feature Area>: Describe your change`
3. Rebase your PR if it gets out of sync with master
3. Rebase your PR if it gets out of sync with main
-->

**Detailed description**:
Expand All @@ -13,6 +13,7 @@ Fixes #<issue number>
**Special notes for your reviewer**:

**Checklist**

- [ ] Documentation added
- [ ] Tests updated

10 changes: 5 additions & 5 deletions .github/workflows/auto-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
ref: master
ref: main
token: ${{ secrets.HEDERA_BOT_TOKEN }}

- name: Import GPG Key
Expand All @@ -94,7 +94,7 @@ jobs:
git checkout -b ${RELEASE_BRANCH}
git push -u origin ${RELEASE_BRANCH}

# create a PR to bump master version to the next snapshot version
# create a PR to bump main branch to the next snapshot version
echo "CREATE_PR=true" >> $GITHUB_ENV
echo "PR_TITLE=Bump versions for v$NEXT_VERSION_SNAPSHOT" >> $GITHUB_ENV
else
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v2
with:
ref: master
ref: main

- name: Import GPG Key
id: gpg_importer
Expand All @@ -179,13 +179,13 @@ jobs:
path: ~/.m2
restore-keys: ${{ runner.os }}-m2

- name: Reset Master to Release Branch
- name: Reset main to release branch
run: |
git fetch origin $RELEASE_BRANCH:$RELEASE_BRANCH
git reset --hard $RELEASE_BRANCH

- name: Maven Release for Next Minor Snapshot
run: ./mvnw clean package $MAVEN_CLI_OPTS -Drelease.version=$NEXT_VERSION_SNAPSHOT -Drelease.chartVersion=$NEXT_CHART_VERSION_SNAPSHOT -Ddocker.tag.version=master -N -P=release
run: ./mvnw clean package $MAVEN_CLI_OPTS -Drelease.version=$NEXT_VERSION_SNAPSHOT -Drelease.chartVersion=$NEXT_CHART_VERSION_SNAPSHOT -Ddocker.tag.version=main -N -P=release

- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/charts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Charts

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down Expand Up @@ -31,14 +31,14 @@ jobs:
fetch-depth: 0

- name: Build images
run: ./mvnw ${MAVEN_CLI_OPTS} install -pl hedera-mirror-grpc,hedera-mirror-importer,hedera-mirror-rest --also-make -Dskip.npm -DskipTests -Ddocker.tag.version=master
run: ./mvnw ${MAVEN_CLI_OPTS} install -pl hedera-mirror-grpc,hedera-mirror-importer,hedera-mirror-rest --also-make -Dskip.npm -DskipTests -Ddocker.tag.version=main

- name: Create k3d cluster
run: |
set -ex
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
k3d cluster create mirror --agents 1 --timeout 5m
k3d image import -c mirror "gcr.io/mirrornode/hedera-mirror-grpc:master" "gcr.io/mirrornode/hedera-mirror-importer:master" "gcr.io/mirrornode/hedera-mirror-rest:master"
k3d image import -c mirror "gcr.io/mirrornode/hedera-mirror-grpc:main" "gcr.io/mirrornode/hedera-mirror-importer:main" "gcr.io/mirrornode/hedera-mirror-rest:main"

- name: Install ct
uses: helm/chart-testing-action@v2.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/grpc-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "gRPC API"

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/importer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Importer"

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "Monitor"

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release Integration

on:
push:
branches: [ master ]
branches: [ main ]

jobs:
publish:
Expand All @@ -29,7 +29,7 @@ jobs:
run: gcloud auth configure-docker gcr.io,marketplace.gcr.io

- name: Build and push images
run: ./mvnw ${MAVEN_CLI_OPTS} deploy -DskipTests -Ddocker.tag.version=master
run: ./mvnw ${MAVEN_CLI_OPTS} deploy -DskipTests -Ddocker.tag.version=main

deploy:
needs: publish
Expand All @@ -44,4 +44,4 @@ jobs:

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Upgrade integration to master ${{ github.sha }}
commit_message: Upgrade integration to main ${{ github.sha }}
2 changes: 1 addition & 1 deletion .github/workflows/rest-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "REST API"

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rosetta-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Rosetta API

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]
push:
tags: [ v* ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Security

on:
pull_request:
branches: [ master, release/** ]
branches: [ main, release/** ]

env:
MAVEN_CLI_OPTS: --batch-mode --no-transfer-progress
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Windows

on:
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
Loading