Skip to content

Commit

Permalink
Migrate from master to main (#1029)
Browse files Browse the repository at this point in the history
  • Loading branch information
charliefoxtwo authored Jan 21, 2025
1 parent 9e524ab commit 55668f2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ jobs:
with:
tag: latest
force_push_tag: true
message: Nightly build of master branch
message: Nightly build of main branch

- name: Upload Release
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifactErrorsFailBuild: true
artifacts: './Scripts/${{ steps.filename.outputs.zip }},./Programs/Arduino_Tools.zip'
commit: master
commit: main
makeLatest: true
name: 'DCS-BIOS Nightly ${{ steps.date.outputs.date }}'
prerelease: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Deploy static content to Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
#### Before Submitting A Bug Report

- **Check if you can reproduce the problem [in the latest version of DCS-BIOS](https://github.com/DCS-Skunkworks/dcs-bios/blob/master/README.md#installation)**.
- **Check if you can reproduce the problem [in the latest version of DCS-BIOS](https://github.com/DCS-Skunkworks/dcs-bios/blob/main/README.md#installation)**.
- **Check the [discussions](https://github.com/DCS-Skunkworks/dcs-bios/discussions)** for a list of common questions and problems.
- **Perform a [cursory search](https://github.com/search?q=+is%3Aissue+user%3ADCS-Skunkworks)** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one.

Expand Down Expand Up @@ -82,7 +82,7 @@ Include details about your configuration and environment:

This section guides you through submitting an enhancement suggestion for DCS-BIOS, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion :pencil: and find related suggestions :mag_right:.

Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](https://github.com/DCS-Skunkworks/dcs-bios/blob/master/.github/ISSUE_TEMPLATE/feature_request.md), including the steps that you imagine you would take if the feature you're requesting existed.
Before creating enhancement suggestions, please check [this list](#before-submitting-an-enhancement-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](https://github.com/DCS-Skunkworks/dcs-bios/blob/main/.github/ISSUE_TEMPLATE/feature_request.md), including the steps that you imagine you would take if the feature you're requesting existed.

#### Before Submitting An Enhancement Suggestion

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ For questions, consider asking in our [Discussions][discussions-url] page, or re
[issues-shield]: https://img.shields.io/github/issues/DCS-Skunkworks/dcs-bios.svg?style=for-the-badge
[issues-url]: https://github.com/DCS-Skunkworks/dcs-bios/issues
[license-shield]: https://img.shields.io/github/license/DCS-Skunkworks/dcs-bios.svg?style=for-the-badge
[license-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/master/LICENSE
[license-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/main/LICENSE
[release-shield]: https://img.shields.io/github/release/DCS-Skunkworks/dcs-bios.svg?style=for-the-badge
[release-url]: https://github.com/DCS-Skunkworks/dcs-bios/releases
[discord-shield]: https://img.shields.io/discord/533342958712258572?style=for-the-badge
Expand All @@ -287,9 +287,9 @@ For questions, consider asking in our [Discussions][discussions-url] page, or re
[latest-release-url]: https://github.com/DCS-Skunkworks/dcs-bios/releases/latest
[wiki-url]: https://github.com/DCS-Skunkworks/dcs-bios/wiki/
[discussions-url]: https://github.com/DCS-Skunkworks/dcs-bios/discussions/
[user-guide-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/master/Scripts/DCS-BIOS/doc/userguide.adoc
[user-guide-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/main/Scripts/DCS-BIOS/doc/userguide.adoc
[dcsbiosbridge-url]: https://github.com/DCS-Skunkworks/DCSBIOSBridge/releases
[developer-guide-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/master/Scripts/DCS-BIOS/doc/developerguide.adoc
[contributing-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/master/CONTRIBUTING.md
[developer-guide-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/main/Scripts/DCS-BIOS/doc/developerguide.adoc
[contributing-url]: https://github.com/DCS-Skunkworks/dcs-bios/blob/main/CONTRIBUTING.md

[client-lib-dcs-bios-communicator-url]: https://github.com/charliefoxtwo/DCS-BIOS-Communicator
6 changes: 3 additions & 3 deletions doc/website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ <h3>Building a panel?</h3>
<p class="mb-4">For further instructions on how to set up your first custom Arduino panel, check out
our User Guide.</p>
<a class="btn btn-primary"
href="https://github.com/DCS-Skunkworks/dcs-bios/blob/master/Scripts/DCS-BIOS/doc/userguide.adoc#step-2-connecting-your-led-and-push-button-switch"
href="https://github.com/DCS-Skunkworks/dcs-bios/blob/main/Scripts/DCS-BIOS/doc/userguide.adoc#step-2-connecting-your-led-and-push-button-switch"
target="_blank">
User Guide
</a>
Expand Down Expand Up @@ -267,7 +267,7 @@ <h5>About DCS-BIOS</h5>
<div class="col-sm-2">
<h5>Legal</h5>
<ul class="list-unstyled">
<li><a href="https://github.com/DCS-Skunkworks/dcs-bios/blob/master/LICENSE"
<li><a href="https://github.com/DCS-Skunkworks/dcs-bios/blob/main/LICENSE"
target="_blank">License</a></li>
</ul>
</div>
Expand Down Expand Up @@ -295,4 +295,4 @@ <h5>Help</h5>

</body>

</html>
</html>

0 comments on commit 55668f2

Please sign in to comment.