diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13667c1..134601b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ -# Build and test pull requests into master and Development +# Build and test pull requests into main and development # (replaces azure-pipelines-mergetest.yml) name: Build on: pull_request: - branches: [ master, Development ] + branches: [ main, development ] workflow_dispatch: env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5201941..6827a31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# Build, test, package, publish to nuget.org and tag the release on pushes to master +# Build, test, package, publish to nuget.org and tag the release on pushes to main # (replaces the Azure DevOps build and release pipelines) # # Publishing uses NuGet Trusted Publishing (OIDC), so no API key is stored in GitHub. @@ -13,10 +13,10 @@ name: Release on: push: - branches: [ master ] + branches: [ main ] paths-ignore: - '**.md' - - '.github/workflows/build.yml' + - '.github/workflows/**' workflow_dispatch: inputs: publish: diff --git a/README.md b/README.md index a10178b..3ebd33e 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ In v3.1 and above the InitVector key is passed explicilty to the `IEncryptionPro `IWebClient` has been removed and now constructors for `GrpcServiceClientBase` and `RestServiceClientBase` receive `GrpcClientOptions` and `RestApiClientOptions` to provide configuration data. ## Build status -[![Release](https://github.com/newky2k/PortableWebClient/actions/workflows/release.yml/badge.svg?branch=master)](https://github.com/newky2k/PortableWebClient/actions/workflows/release.yml) +[![Release](https://github.com/newky2k/PortableWebClient/actions/workflows/release.yml/badge.svg?branch=main)](https://github.com/newky2k/PortableWebClient/actions/workflows/release.yml)