Skip to content

Commit de80fab

Browse files
BasudevBharatBhushanBasudevBharatBhushan
authored
Merge pull request #8 from mindfiredigital/master
Master
2 parents 544718f + 6fd35bb commit de80fab

File tree

5 files changed

+201
-139
lines changed

5 files changed

+201
-139
lines changed

‎.github/workflows/workflow.yml‎

Lines changed: 57 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,53 +15,68 @@ jobs:
1515
release:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- name: Checkout master branch
19-
uses: actions/checkout@v4
20-
with:
21-
ref: master
22-
fetch-depth: 0
18+
- name: Checkout master branch
19+
uses: actions/checkout@v4
20+
with:
21+
ref: master
22+
fetch-depth: 0
2323

24-
- name: Create and push to main
25-
run: |
26-
git checkout -b main
27-
git push origin main
24+
# - name: Create and push to main
25+
# run: |
26+
# git checkout -b main
27+
# git push origin main
2828

29-
- name: Checkout release branch
30-
run: git checkout main
29+
- name: Create and push to feature branch
30+
run: |
31+
git checkout -b release-main
32+
git push origin release-main
3133
32-
- name: Set up Python
33-
uses: actions/setup-python@v3
34-
with:
35-
python-version: '3.x'
34+
- name: Raise PR from release-main to main
35+
uses: peter-evans/create-pull-request@v5
36+
with:
37+
base: main
38+
head: release-main
39+
title: "Automated Release PR: release-main -> main"
40+
body: "This PR contains the automated changes for the release process."
41+
branch: pr-release-main-to-main
3642

37-
- name: Install dependencies
38-
run: |
39-
python -m pip install --upgrade pip
40-
pip install build twine python-semantic-release setuptools-scm
43+
- name: Checkout release branch
44+
# run: git checkout main
45+
run: git checkout release-main
4146

42-
- name: Run semantic-release
43-
env:
44-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
45-
run: |
46-
git config user.name github-actions
47-
git config user.email github-actions@github.com
48-
semantic-release version
49-
semantic-release publish
47+
- name: Set up Python
48+
uses: actions/setup-python@v3
49+
with:
50+
python-version: "3.x"
5051

51-
- name: Build package
52-
run: python -m build
52+
- name: Install dependencies
53+
run: |
54+
python -m pip install --upgrade pip
55+
pip install build twine python-semantic-release setuptools-scm
5356
54-
- name: Publish package to PyPI
55-
env:
56-
TWINE_USERNAME: __token__
57-
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
58-
run: twine upload dist/*
57+
- name: Run semantic-release
58+
env:
59+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
run: |
61+
git config user.name github-actions
62+
git config user.email github-actions@github.com
63+
semantic-release version
64+
semantic-release publish
5965
60-
- name: Raise PR from main to master
61-
uses: peter-evans/create-pull-request@v5
62-
with:
63-
base: master
64-
head: main
65-
title: 'Release PR: main -> master'
66-
body: 'This PR merges the changes from the main branch back into master after the release.'
67-
branch: pr-main-to-master
66+
- name: Build package
67+
run: python -m build
68+
69+
- name: Publish package to PyPI
70+
env:
71+
TWINE_USERNAME: __token__
72+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
73+
run: twine upload dist/*
74+
75+
- name: Raise PR from main to master
76+
uses: peter-evans/create-pull-request@v5
77+
with:
78+
base: master
79+
head: main
80+
title: "Release PR: main -> master"
81+
body: "This PR merges the changes from the main branch back into master after the release."
82+
branch: pr-main-to-master

‎.pre-commit-config.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v2.3.0
4+
hooks:
5+
- id: check-yaml
6+
- id: end-of-file-fixer
7+
- id: trailing-whitespace
8+
- repo: https://github.com/psf/black
9+
rev: 22.10.0
10+
hooks:
11+
- id: black
12+
13+
- repo: local
14+
hooks:
15+
- id: pylint
16+
name: pylint
17+
entry: pylint
18+
language: system
19+
types: [python]
20+
require_serial: true
21+
args: [
22+
"-rn", # Only display messages
23+
"-sn", # Don't display the score
24+
]
25+
files: ^app/.*\.py$

‎CHANGELOG.md‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
2+
# Changelog
3+
4+
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
5+
6+
## [Unreleased]
7+
8+
### Added
9+
10+
- [List new features or enhancements added but not yet released]
11+
12+
### Changed
13+
14+
- [List changes, improvements, or modifications made but not yet released]
15+
16+
### Fixed
17+
18+
- [List bug fixes or corrections made but not yet released]
19+
20+
## [Version] - YYYY-MM-DD
21+
22+
### Added
23+
24+
- [List new features or enhancements added in this version]
25+
26+
### Changed
27+
28+
- [List changes, improvements, or modifications made in this version]
29+
30+
### Fixed
31+
32+
- [List bug fixes or corrections made in this version]
33+
34+
## [Older Versions]
35+
36+
[Repeat the above sections for older versions of your project]
37+
38+
## Contributing
39+
40+
Please read [CONTRIBUTING.md](./contributing-template.md) for details on our code of conduct, and the process for submitting pull requests to us.
41+
42+
## Authors
43+
44+
- Author 1
45+
- Author 2
46+
47+
## License
48+
49+
This project is licensed under the [License Name] - see the [LICENSE.md](./license-template.md) file for details.
50+
51+
## Customization
52+
53+
You can customize this changelog to meet the specific needs and preferences of your project. Feel free to modify the structure, add more details, or change the formatting to better suit your project's versioning and documentation requirements.

0 commit comments

Comments
 (0)