Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into alpha
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/publish_version_change.yml
#	requirements/base.txt
#	requirements/services/client.txt
#	requirements/services/observer.txt
#	requirements/services/server.txt
#	version.py
#	version_bump.py
  • Loading branch information
kirgrim committed May 30, 2024
2 parents 85b64d6 + 2351bf7 commit e8cf374
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/deploy_containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ jobs:
if: github.event_name == 'workflow_dispatch'
run: |
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
- name: Apply Workflow Run Environments
if: github.event_name == 'workflow_run'
run: |
echo "VERSION=$(echo ${{ github.ref_name }} | tr / -)" >> $GITHUB_ENV
- name: Apply Push Environments
if: github.event_name == 'push'
run: |
Expand Down
3 changes: 2 additions & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

__version__ = "0.4.5a17"

__version__ = "0.4.5"

0 comments on commit e8cf374

Please sign in to comment.