Skip to content

Commit

Permalink
Merge pull request #690 from ErikMogensen/master2main
Browse files Browse the repository at this point in the history
master -> main
  • Loading branch information
paolosalvatori committed Oct 6, 2022
2 parents e8bc9eb + f8ec4cb commit 75dde48
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/handle-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Handle pull request
on:
pull_request:
branches:
- develop
- master
- main
workflow_dispatch:

jobs:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/handle-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ jobs:
echo "::set-output name=tag-hash::${hash}"
echo $hash
- name: Checkout master
- name: Checkout main
uses: actions/checkout@v3
with:
ref: master
ref: main

- name: Get latest master commit hash
id: master-commit-hash
- name: Get latest main commit hash
id: main-commit-hash
run: |
hash=$(git log -n1 --format=format:"%H")
echo "::set-output name=master-hash::${hash}"
echo "::set-output name=main-hash::${hash}"
echo $hash
- name: Verify tag commit matches master commit - exit if they don't match
if: steps.tag-commit-hash.outputs.tag-hash != steps.master-commit-hash.outputs.master-hash
- name: Verify tag commit matches main commit - exit if they don't match
if: steps.tag-commit-hash.outputs.tag-hash != steps.main-commit-hash.outputs.main-hash
run: |
echo "Tag was not on the master branch. Exiting."
echo "Tag was not on the main branch. Exiting."
exit 1
get-version:
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[![Build status](https://ci.appveyor.com/api/projects/status/x5niu29yhun36hda/branch/master?svg=true)](https://ci.appveyor.com/project/seanfeldman/servicebusexplorer/branch/master)

**Author:** Paolo Salvatori ([@babosbird](https://twitter.com/babosbird))
**Collaborators:** Sean Feldman ([@sfeldman](https://twitter.com/sfeldman)) and Erik Mogensen (@koltrast)
**Collaborators:** Sean Feldman ([@sfeldman](https://twitter.com/sfeldman)) and Erik Mogensen ([@koltrast](https://twitter.com/koltrast))
**Contributors:** [Many](https://github.com/paolosalvatori/ServiceBusExplorer/graphs/contributors)

# Service Bus Explorer
Expand Down Expand Up @@ -29,7 +27,7 @@ There are no dedicated developers so development is entirely based on voluntary

Here are some guidelines concerning contributions:

- All contributions should be done on `master`.
- All contributions should be done on `main`.
- Every pull request is built by GitHub Actions and should preferably be linked to a GitHub issue.
- Write unit tests, if applicable.
- We have started to migrate from the old SDK to the latest SDKs for Service Bus, Event Hubs, Relay and Notification Hubs. Therefore, new classes should not depend on the old SDK unless absolutely necessary.
Expand Down
2 changes: 1 addition & 1 deletion VERIFICATION-Template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ and can be verified like this:
checksum type: md5
checksum64: %CHECKSUM%

File 'LICENSE.txt' is obtained from <https://github.com/paolosalvatori/ServiceBusExplorer/blob/master/LICENSE.txt>
File 'LICENSE.txt' is obtained from <https://github.com/paolosalvatori/ServiceBusExplorer/blob/main/LICENSE.txt>
2 changes: 1 addition & 1 deletion src/ServiceBusExplorer/ServiceBusExplorer.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<copyright>Copyright 2017 Paolo Salvatori</copyright>
<licenseUrl>https://github.com/paolosalvatori/ServiceBusExplorer#license</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<iconUrl>https://raw.githubusercontent.com/paolosalvatori/ServiceBusExplorer/master/src/ServiceBusExplorer/Icons/NewServiceBusExplorerLogo.ico</iconUrl>
<iconUrl>https://raw.githubusercontent.com/paolosalvatori/ServiceBusExplorer/main/src/ServiceBusExplorer/Icons/NewServiceBusExplorerLogo.ico</iconUrl>
<docsUrl>https://github.com/paolosalvatori/ServiceBusExplorer/wiki</docsUrl>
<releaseNotes>https://github.com/paolosalvatori/ServiceBusExplorer/releases</releaseNotes>
<dependencies></dependencies>
Expand Down

0 comments on commit 75dde48

Please sign in to comment.