Skip to content

Commit

Permalink
Change branches from main to master
Browse files Browse the repository at this point in the history
  • Loading branch information
Erriez committed Aug 21, 2022
1 parent fc9848b commit c19e7f9
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
value: |
Thanks for taking the time to request a feature or suggest a new idea!
* Before reporting a feature please check and search in [List of existing issues](https://github.com/Erriez/ErriezOregonTHN128/issues?q=is%3Aissue)
* Please check [Online Documentation](https://github.com/Erriez/ErriezOregonTHN128/blob/main/README.md)
* Please check [Online Documentation](https://github.com/Erriez/ErriezOregonTHN128/blob/master/README.md)
- type: input
id: feature
Expand Down Expand Up @@ -72,7 +72,7 @@ body:
label: Export restrictions.
description: The owner of this repository Erriez included an explict export restriction to Russia.
options:
- label: I accept [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/main/END_USER_AGREEMENT.md).
- label: I accept [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/master/END_USER_AGREEMENT.md).
required: true

- type: markdown
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/issue_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
value: |
Thanks for taking the time to report an issue!
* Before reporting a new issue please check and search in [List of existing issues](https://github.com/Erriez/ErriezOregonTHN128/issues?q=is%3Aissue)
* Please check [Online Documentation](https://github.com/Erriez/ErriezOregonTHN128/blob/main/README.md)
* Please check [Online Documentation](https://github.com/Erriez/ErriezOregonTHN128/blob/master/README.md)
- type: input
id: board
Expand Down Expand Up @@ -106,7 +106,7 @@ body:
label: Export restrictions.
description: The owner of this repository Erriez included an explict export restriction to Russia.
options:
- label: I accept [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/main/END_USER_AGREEMENT.md).
- label: I accept [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/master/END_USER_AGREEMENT.md).
required: true

- type: markdown
Expand Down
17 changes: 8 additions & 9 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,24 @@ Thanks for taking the time to create a pull request!
2. [ ] I could not find [related issues](https://github.com/Erriez/ErriezOregonTHN128/issues?q=is%3Aissue).
3. [ ] I have tested this pull request and updated documentation.
4. [ ] I understand that this library is maintained by volunteers in spare time. Response time may vary.
4. [ ] I accept the export restriction to Russia in [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/main/END_USER_AGREEMENT.md).
4. [ ] I accept the export restriction to Russia in [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/master/END_USER_AGREEMENT.md).

**This entire section above can be deleted if all items are checked.**

-----------

## Description and Impact
Describe your proposed Pull Request and it's impact.
eg: This pull request fixes an issue with... and affects boards...
Describe your proposed Pull Request and it's impact:
This pull request fixes an issue with... and affects boards...

## Link to other issues
Provide relevant links to related issues, PRs etc.
eg: "Issue #13"
Provide relevant links to related issues, PRs etc:
Issue #123

## Tested version
Which version was used to test this pull request?
eg:
- Branch `main`
- Hash: `123456`
- Tag: `v1.0.0"`
- Branch: master
- Hash: 123456
- Tag: v1.0.0

Thanks for your contribution!
9 changes: 6 additions & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ on:
workflow_dispatch:

env:
REPO_NAME: ${{ github.event.repository.name }}
# To use repository name: ${{ github.event.repository.name }}
PDF_NAME: ${{ github.event.repository.name }}
# Branch name "master" or "main"
BRANCH_NAME: "master"

jobs:
build:
Expand Down Expand Up @@ -87,15 +90,15 @@ jobs:
shell: bash

- name: Generate Doxygen PDF
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/$BRANCH_NAME' }}
run: |
sudo apt-get install texlive-latex-recommended texlive-pictures texlive-latex-extra -y
make -C docs/latex
cp docs/latex/refman.pdf docs/html/$REPO_NAME.pdf
shell: bash

- name: Deploy to GitHub branch gh-pages
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/$BRANCH_NAME' }}
uses: JamesIves/github-pages-deploy-action@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Licence MIT](https://img.shields.io/badge/license-MIT-green)](https://github.com/Erriez/ErriezOregonTHN128/blob/main/LICENSE)
[![Licence MIT](https://img.shields.io/badge/license-MIT-green)](https://github.com/Erriez/ErriezOregonTHN128/blob/master/LICENSE)
[![Language C/C++](https://img.shields.io/badge/language-C%2FC%2B%2B-informational)](https://github.com/Erriez/ErriezOregonTHN128)
[![Release tag](https://img.shields.io/github/v/release/Erriez/ErriezOregonTHN128?display_name=tag)](https://github.com/Erriez/ErriezOregonTHN128/releases)
[![Open issue](https://shields.io/github/issues-raw/Erriez/ErriezOregonTHN128)](https://github.com/Erriez/ErriezOregonTHN128/issues)
Expand Down Expand Up @@ -262,10 +262,10 @@ https://www.saleae.com/downloads/.

## MIT License

This project is published under [MIT license](https://github.com/Erriez/ErriezOregonTHN128/blob/main/LICENSE)
This project is published under [MIT license](https://github.com/Erriez/ErriezOregonTHN128/blob/master/LICENSE)
with an additional end user agreement (next section).

## End User Agreement :ukraine:

End users shall accept the [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/main/END_USER_AGREEMENT.md)
End users shall accept the [End User Agreement](https://github.com/Erriez/ErriezOregonTHN128/blob/master/END_USER_AGREEMENT.md)
holding export restrictions to Russia to stop the WAR before using this project.

0 comments on commit c19e7f9

Please sign in to comment.