Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)



Expand Down