0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-21 21:48:21 -05:00

Compare commits

...

32 Commits

Author SHA1 Message Date
Abhinav Pandey
c8887511a4
Merge f2a32252ce into a92550e050 2024-01-31 07:09:43 +00:00
Scott
a92550e050
👷 GitHub action to automate release based on semantic versioning (#499)
* ci: add release.yml to help automate release versions

* ci: add release.yml to help automate release versions - edited file further to cover edge cases

* ci: add release.yml to help automate release versions - I had a typo in a line which pointed at a different variable

* ci: add release.yml to help automate release versions - Fixing the release portion to prepend a v

* ci: add release.yml to help automate release versions. Lowercased V so it looks like v1.1.0 instead of V1.1.0

* ci: changing structure of release.yml to be easier to understand

* ci: #minor changes made

* ci: #minor changes made to make rolling and stable both release branches

* ci: #minor changes to hopefully turn off pre-release

* ci: #minor change - trying to make pre-release suffic set to nothing

* ci: #minor change - removed older release action for a better up to date one

* ci: #minor change

* ci: #minor change to fixed the pre-release issue

* ci: #minor change to fixed the pre-release issue again

* ci: #minor change to fixed the pre-release issue again2

* ci: changed action for tag. I believe it was causing errors

* ci: missing }

* ci: testing some things

* ci: fixing self inflicted error where I forgot to put an ID in

* ci: fixing to make the release branch rolling

* major: testing updating major

* BREAKING CHANGE: removed changelog action

* ci: reset commit and removed changelog

* ci: changed action for tag. I believe it was causing errors

* ci: missing }

* ci: testing some things

* ci: fixing self inflicted error where I forgot to put an ID in

* ci: fixing to make the release branch rolling

* ci: reset commit and removed changelog

* ci: added step to change Cargo.toml app version to the latest tag version without the v

* ci: using echo and double quotes in the appversion variable. Testing now

* ci: testing autocommit

* Apply automatic changes

* ci: testing autocommit further

* ci: testing autocommit: removing tagging since it creates another tag instead of using that tag

* Apply automatic changes

* ci: testing autocommit with branch protection and doing a PR to rolling

* Apply automatic changes

* ci: testing PR create and merge - removed the if that was causing it not to run

* ci: testing PR create and merge - removed the if that was causing it not to run

* Apply automatic changes

* ci: testing PR create and merge - fixed permission issues

* ci: testing PR create and merge - fixed permission issues

* Apply automatic changes

* ci: testing PR create and merge - potentially fixed PR issue

* Apply automatic changes

* ci: testing PR create and merge - potentially fixed PR issue2

* ci: testing PR create and merge - potentially fixed PR issue + fixing what branch it targets

* ci: testing PR create and merge - testing PAT

* ci: testing PR create and merge - testing to see if merge loop stops

* ci: adding in cargo.toml version in auto git commit

* Update Cargo.toml

Co-authored-by: alamin655 <129589283+alamin655@users.noreply.github.com>

* ci: adding in steps to regenerate the Cargo.lock file

* ci: adding in steps to regenerate the Cargo.lock file - fixing commit issue with cargo.toml

---------

Co-authored-by: scottc943 <scottc943@users.noreply.github.com>
Co-authored-by: alamin655 <129589283+alamin655@users.noreply.github.com>
2024-01-31 07:08:37 +00:00
mergify[bot]
f2a32252ce
Merge branch 'rolling' into rolling 2023-12-30 16:07:42 +00:00
mergify[bot]
bdc5170c87
Merge branch 'rolling' into rolling 2023-12-30 06:58:26 +00:00
mergify[bot]
f59a68ea41
Merge branch 'rolling' into rolling 2023-12-25 13:13:46 +00:00
mergify[bot]
6b3e309670
Merge branch 'rolling' into rolling 2023-12-22 04:32:43 +00:00
mergify[bot]
154880ca94
Merge branch 'rolling' into rolling 2023-12-14 16:38:12 +00:00
mergify[bot]
78d84ae6cb
Merge branch 'rolling' into rolling 2023-12-13 13:24:46 +00:00
mergify[bot]
c8a80d0d3b
Merge branch 'rolling' into rolling 2023-12-11 03:46:06 +00:00
mergify[bot]
4e11bedc91
Merge branch 'rolling' into rolling 2023-12-06 02:45:37 +00:00
alamin655
0991fe8ed9
Merge branch 'rolling' into rolling 2023-12-02 17:16:39 +05:30
mergify[bot]
6cc3f49fb7
Merge branch 'rolling' into rolling 2023-11-30 12:09:54 +00:00
neon_arch
ab8f38b1ef
Merge branch 'rolling' into rolling 2023-11-25 12:38:11 +03:00
Abhinav Pandey
9706363527
Merge branch 'rolling' into rolling 2023-11-21 20:08:27 +05:30
mergify[bot]
9aa817cb59
Merge branch 'rolling' into rolling 2023-10-31 05:39:09 +00:00
mergify[bot]
8a7d2773cf
Merge branch 'rolling' into rolling 2023-10-27 20:39:22 +00:00
mergify[bot]
965af2f92c
Merge branch 'rolling' into rolling 2023-10-23 13:35:37 +00:00
Abhinav Pandey
8f3aceb9dd
Merge branch 'rolling' into rolling 2023-10-22 11:01:56 +05:30
alamin655
b0ece9b921
Merge branch 'rolling' into rolling 2023-10-19 18:03:00 +05:30
Abhinav Pandey
25730ba5fa
Merge branch 'neon-mmd:rolling' into rolling 2023-10-16 04:03:28 +05:30
mergify[bot]
23f74599d7
Merge branch 'rolling' into rolling 2023-10-13 04:15:31 +00:00
mergify[bot]
5c53c6b4cd
Merge branch 'rolling' into rolling 2023-10-04 04:07:51 +00:00
alamin655
dc5f1f0e38
Merge branch 'rolling' into rolling 2023-10-04 09:35:06 +05:30
alamin655
66fbf2382f
Merge branch 'rolling' into rolling 2023-10-03 11:58:23 +05:30
alamin655
efc2908ea9
Merge branch 'rolling' into rolling 2023-10-03 09:01:11 +05:30
alamin655
8b21aca1b2
Merge branch 'rolling' into rolling 2023-10-01 12:38:21 +05:30
alamin655
a41d2be0ac
Merge branch 'rolling' into rolling 2023-09-28 07:55:07 +05:30
alamin655
ff141c1df1
Merge branch 'rolling' into rolling 2023-09-26 17:32:48 +05:30
alamin655
8016362008
Merge branch 'rolling' into rolling 2023-09-24 14:41:06 +05:30
alamin655
5437b99d0e
Merge branch 'rolling' into rolling 2023-09-23 18:53:34 +05:30
Abhinav Pandey
f716dfbc80
Merge branch 'neon-mmd:rolling' into rolling 2023-09-23 18:08:59 +05:30
Abhinav Pandey
02a098c169 Update CODE_OF_CONDUCT 2023-09-23 18:08:43 +05:30
2 changed files with 129 additions and 53 deletions

View File

@ -4,82 +4,86 @@
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community and as such we strongly believe in **give respect and take respect** policy.
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. We firmly believe in the **give respect and take respect** policy.
# What We Strive At
---
* **Be patient.**
* **Be welcoming and be friendly**: We strive to be a community that welcomes, supports and remain friendly to people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
* **Be considerate**: Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
* **Be respectful**: Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. Its important to remember that a community where people feel uncomfortable or threatened is not a productive one.
* **Be careful in the words that you choose**: we are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
* Violent threats or language directed against another person.
* Discriminatory jokes and language.
* Using political talks and political orientated views.
* Posting sexually explicit or violent material.
* Posting (or threatening to post) other people's personally identifying information ("doxing").
* Personal insults, especially those using racist or sexist terms.
* Unwelcome sexual attention.
* Advocating for, or encouraging, any of the above behavior.
* Humor is acceptable but should not be done to harass, demean or to insult others.
* Repeated harassment of others. In general, if someone asks you to stop, then stop.
* Using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all.
* Using bad words or cursing.
* **When we disagree, try to understand why**: Disagreements, both social and technical, happen all the time. It is important that we resolve disagreements and differing views constructively. Remember that were different. The strength of our community comes from its diversity, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesnt mean that theyre wrong. Dont forget that it is human to err and blaming each other doesnt get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
* **Treat everyone equally:** we are community of mature people and maturity in the way we act, behave and treat others and as such we treat others as our brothers and sisters.
## What We Strive At
# Scope
### Be patient.
### Be welcoming and be friendly
We strive to be a community that welcomes and supports people from all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, color, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
The scope of the conduct of code is not limited to one individual or few individuals. This code of conduct applies for all be it the maintainer, the developer or any role assigned to the project or involved in any other way to the project. This code of conduct is not to provide privelages of one over the other. Any failure to enforce, act, using the code of conduct for your benefit or to evade certain situations or findings way to evade this conduct or a failure to provide a safe environment for others under the umberalla of this code of conduct will be considered a clear act of violation.
### Be considerate
Your work will be used by other people, and you will depend on the work of others. Consider the global nature of our community when communicating, as you might not be interacting in someone else's primary language.
# Violation
### Be respectful
Disagreement is no excuse for poor behavior. While we all get frustrated, it should never result in personal attacks. A community where people feel uncomfortable is counterproductive.
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
### Be careful in the words that you choose
We expect professional conduct. Harassment, exclusionary behavior, and other unprofessional behaviors are unacceptable. This includes:
- Violent threats or discriminatory language.
- Discriminatory jokes.
- Exclusion based on political talks/views.
- Posting explicit content or doxing.
- Personal insults, especially those with harmful intent.
- Unwanted sexual attention or behavior.
- Encouraging any of the above behaviors.
- Inappropriate humor.
- Persistent harassment.
- Using offensive aliases or nicknames.
- Using profanities.
1. **Correction**
### When we disagree, try to understand why
Our community is diverse. Approach disagreements with an open mind and a willingness to understand.
**Community Impact:** Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
### Treat everyone equally
We are a community of maturity. Treat everyone as a sibling.
**Consequence:** A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
---
2. **Warning**
## Scope
**Community Impact:** A violation through a single incident or series of actions.
This Code of Conduct applies to everyone, irrespective of their role. Using this Code of Conduct for personal gain or to evade responsibilities will be considered a violation.
**Consequence:** A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
---
3. **Temporary Ban**
## Violation
**Community Impact:** A serious violation of community standards, including sustained inappropriate behavior.
Violations will result in consequences as described:
**Consequence:** A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
1. **Correction**
*Community Impact:* Inappropriate or unprofessional behavior.
*Consequence:* A private written warning and possibly a public apology.
4. **Permanent Ban**
2. **Warning**
*Community Impact:* A single serious violation or multiple minor ones.
*Consequence:* A warning with stipulated consequences for future breaches. This may include limited interaction with certain individuals or platforms.
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
3. **Temporary Ban**
*Community Impact:* A serious, sustained violation of community standards.
*Consequence:* A temporary ban from community interactions.
**Consequence**: A permanent ban from any sort of public interaction within the community.
4. **Permanent Ban**
*Community Impact:* Prolonged harmful behavior.
*Consequence:* A permanent ban from community interactions.
---
# Reporting Issues
## Reporting Issues
If you experience or witness unacceptable behavior—or have any other concerns—please report it by contacting the community leader via [mustafadhuleb53@gmail.com](mustafadhuleb53@gmail.com). All reports will be handled with discretion. In your report please include:
Experiencing or witnessing unacceptable behavior? Report it by [Emailing Us](mailto:mustafadhuleb53@gmail.com). Reports are confidential. In your report, please provide:
- Your contact details.
- Involved individuals.
- Description of the occurrence.
- Relevant links if available.
- Your contact information.
- Names (real, nicknames, or pseudonyms) of any individuals involved. If there are additional witnesses, please
include them as well. Your account of what occurred, and if you believe the incident is ongoing. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger), please include a link.
- Any additional information that may be helpful.
Anyone asked to cease unacceptable behavior is expected to comply immediately.
Anyone asked to stop unacceptable behavior is expected to comply immediately. If an individual engages in unacceptable behavior, We will act according to the [violations rules](#violation) as stated above.
---
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html, [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) and [Twitter's Code of Conduct](https://github.com/twitter/.github/blob/main/code-of-conduct.md?plain=1)
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
This Code of Conduct draws inspiration from [Contributor Covenant](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html), [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), and [Twitter's Code of Conduct](https://github.com/twitter/.github/blob/main/code-of-conduct.md?plain=1).
Community Impact Guidelines reference [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
For further information, refer to the [FAQ](https://www.contributor-covenant.org/faq) or view [translations](https://www.contributor-covenant.org/translations).

72
.github/workflows/release.yml vendored Normal file
View File

@ -0,0 +1,72 @@
name: Bump release version
on:
pull_request:
branches: [rolling]
types:
- closed
permissions:
contents: write
pull-requests: write
repository-projects: write
concurrency: production
jobs:
build:
name: bump tag version and release
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.sha }}
fetch-depth: 0
- name: Bump version and push tag
id: version-bump
uses: hennejg/github-tag-action@v4.3.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: rolling
- name: create branch
uses: peterjgrainger/action-create-branch@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
branch: update-from-${{ github.sha }}
- name: update cargo.toml
run: |
appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml
- run: rustup toolchain install stable --profile minimal
- run: rustup update stable && rustup default stable
- name: regenerate cargo.lock
run: cargo generate-lockfile
- name: auto commit
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "[skip ci] updating app version to ${{ steps.version-bump.outputs.new_tag }}"
branch: update-from-${{ github.sha }}
# create PR using GitHub CLI
- name: create PR with update info
id: create-pr
run: gh pr create --base rolling --head update-from-${{ github.sha }} --title 'Merge new update into rolling' --body 'Created by Github action'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# merge PR using GitHub CLI
- name: merge PR with update info
id: merge-pr
run: gh pr merge --admin --merge --subject 'Merge update info' --delete-branch
env:
GH_TOKEN: ${{ secrets.ADMIN_RIGHTS_TOKEN }}
- name: Create Release
uses: softprops/action-gh-release@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
generate_release_notes: true
name: ${{ steps.version-bump.outputs.new_tag }}
tag_name: ${{ steps.version-bump.outputs.new_tag }}
prerelease: false
env:
GITHUB_REPOSITORY: ${{ github.repository }}