diff --git a/.github/workflows/certification.yml b/.github/workflows/certification.yml index 5482b986a..8113d9eaa 100644 --- a/.github/workflows/certification.yml +++ b/.github/workflows/certification.yml @@ -24,7 +24,7 @@ on: - 'release-*' pull_request: branches: - - 'master' + - 'main' - 'release-*' jobs: diff --git a/.github/workflows/components-contrib.yml b/.github/workflows/components-contrib.yml index dadf4b865..22707c842 100644 --- a/.github/workflows/components-contrib.yml +++ b/.github/workflows/components-contrib.yml @@ -17,12 +17,12 @@ on: push: branches: - feature/* - - gh-readonly-queue/master/* + - gh-readonly-queue/main/* pull_request: branches: - - master + - main - feature/* - - gh-readonly-queue/master/* + - gh-readonly-queue/main/* merge_group: jobs: diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 5052e9430..9b2a29eef 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -22,12 +22,12 @@ on: push: branches: - 'release-*' - - 'gh-readonly-queue/master/*' + - 'gh-readonly-queue/main/*' pull_request: branches: - - 'master' + - 'main' - 'release-*' - - 'gh-readonly-queue/master/*' + - 'gh-readonly-queue/main/*' merge_group: jobs: @@ -352,7 +352,7 @@ jobs: # Upload logs for test analytics to consume - name: Upload test results if: always() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@main with: name: ${{ matrix.component }}_conformance_test path: ${{ env.TEST_OUTPUT_FILE_PREFIX }}_conformance.* diff --git a/.github/workflows/coverage-reports.yml b/.github/workflows/coverage-reports.yml index a19795ad5..c9bb4df4b 100644 --- a/.github/workflows/coverage-reports.yml +++ b/.github/workflows/coverage-reports.yml @@ -51,7 +51,7 @@ jobs: with: workflow: certification.yml workflow_conclusion: "success" - branch: master + branch: main event: schedule if_no_artifact_found: error name: cert_code_cov @@ -62,7 +62,7 @@ jobs: with: workflow: conformance.yml workflow_conclusion: "success" - branch: master + branch: main event: schedule if_no_artifact_found: error name: conf_code_cov diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index b8cdaf6a0..34f9b71c5 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -15,13 +15,13 @@ name: fossa on: push: branches: - - master + - main - release-* tags: - v* pull_request: branches: - - master + - main - release-* workflow_dispatch: {} jobs: diff --git a/Makefile b/Makefile index 8304a3cb4..14bc63cb2 100644 --- a/Makefile +++ b/Makefile @@ -224,7 +224,7 @@ check-component-metadata: $(RUN_BUILD_TOOLS) generate-metadata-analyzer-app --outputfile ./metadataanalyzer/main.go cd metadataanalyzer && \ go mod init metadataanalyzer && \ - go get "github.com/dapr/components-contrib@master" && \ + go get "github.com/dapr/components-contrib@main" && \ go mod edit -replace "github.com/dapr/components-contrib"="../" && \ go mod tidy && \ go build -tags metadata . && \ diff --git a/README.md b/README.md index dad2d99f4..85b348645 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Components Contrib -[![Build, Lint, Unit Test - complete matrix](https://github.com/dapr/components-contrib/actions/workflows/components-contrib-all.yml/badge.svg?branch=master&event=schedule)](https://github.com/dapr/components-contrib/actions/workflows/components-contrib-all.yml) +[![Build, Lint, Unit Test - complete matrix](https://github.com/dapr/components-contrib/actions/workflows/components-contrib-all.yml/badge.svg?branch=main&event=schedule)](https://github.com/dapr/components-contrib/actions/workflows/components-contrib-all.yml) [![Discord](https://img.shields.io/discord/778680217417809931)](https://discord.com/channels/778680217417809931/781589820128493598) -[![License: Apache 2.0](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/dapr/components-contrib/blob/master/LICENSE) +[![License: Apache 2.0](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/dapr/components-contrib/blob/main/LICENSE) [![FOSSA Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fdapr%2Fcomponents-contrib.svg?type=shield)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fdapr%2Fcomponents-contrib?ref=badge_shield) The purpose of Components Contrib is to provide open, community-driven, reusable components for building distributed applications. diff --git a/tests/conformance/README.md b/tests/conformance/README.md index 0d726f90f..01823f48b 100644 --- a/tests/conformance/README.md +++ b/tests/conformance/README.md @@ -18,7 +18,7 @@ 1. All components/services tested in the automated tests are currently manually setup by the Dapr team and run in an environment maintained by the Dapr team. As a contributor, follow the next two steps for integrating a new component with conformance tests. 2. If the component is tested locally within a docker container requiring no secrets, then add the component to the `pr-components` step in conformance test workflow `.github/conformance.yml`. `pr-components` step generates the component matrix for which the conformance tests will be run on each PR. -3. If the component is tested against a service and requires secrets, then add the component to the `cron-components` step in conformance test workflow `.github/conformance.yml`. `cron-components` defines the components for which the conformance test will be run against the master code in a scheduled manner. +3. If the component is tested against a service and requires secrets, then add the component to the `cron-components` step in conformance test workflow `.github/conformance.yml`. `cron-components` defines the components for which the conformance test will be run against the main code in a scheduled manner. ## Integrating a new component with conformance tests