-
Notifications
You must be signed in to change notification settings - Fork 144
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
41 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,46 +40,46 @@ jobs: | |
git config --global user.name "bsavitzky" | ||
git commit -a -m "Auto-update version number (GH Action)" | ||
git push origin | ||
# sync_with_dev: | ||
# needs: update_version | ||
# runs-on: ubuntu-latest | ||
# name: Sync main with dev | ||
# steps: | ||
# - name: Sync main with dev | ||
# uses: actions/checkout@v4 | ||
# with: | ||
# ref: dev | ||
# fetch-depth: 0 | ||
# token: ${{ secrets.GH_ACTION_VERSION_UPDATE }} | ||
# - run: | | ||
# # set strategy to default merge | ||
# git config pull.rebase false | ||
# git config --global user.email "[email protected]" | ||
# git config --global user.name "bsavitzky" | ||
# git pull origin main --commit --no-edit | ||
# git push origin dev | ||
# deploy: | ||
# needs: sync_with_dev | ||
# runs-on: ubuntu-latest | ||
# name: Deploy to PyPI | ||
# steps: | ||
# - uses: actions/checkout@v4 | ||
# with: | ||
# ref: dev | ||
# - name: Set up Python | ||
# uses: actions/setup-python@v5 | ||
# with: | ||
# python-version: 3.8 | ||
# - name: Install dependencies | ||
# run: | | ||
# python -m pip install --upgrade pip | ||
# pip install build | ||
# - name: Build package | ||
# run: python -m build | ||
# - name: Publish package | ||
# uses: pypa/gh-action-pypi-publish@release/v1 | ||
# with: | ||
# user: __token__ | ||
# password: ${{ secrets.PYPI_API_TOKEN }} | ||
sync_with_dev: | ||
needs: update_version | ||
runs-on: ubuntu-latest | ||
name: Sync main with dev | ||
steps: | ||
- name: Sync main with dev | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: dev | ||
fetch-depth: 0 | ||
token: ${{ secrets.GH_ACTION_VERSION_UPDATE }} | ||
- run: | | ||
# set strategy to default merge | ||
git config pull.rebase false | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "bsavitzky" | ||
git pull origin main --commit --no-edit | ||
git push origin dev | ||
deploy: | ||
needs: sync_with_dev | ||
runs-on: ubuntu-latest | ||
name: Deploy to PyPI | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
ref: dev | ||
- name: Set up Python | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: 3.8 | ||
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install build | ||
- name: Build package | ||
run: python -m build | ||
- name: Publish package | ||
uses: pypa/gh-action-pypi-publish@release/v1 | ||
with: | ||
user: __token__ | ||
password: ${{ secrets.PYPI_API_TOKEN }} | ||
|
||
|