Skip to content

Commit f835275

Browse files
authored
Merge branch 'dev' into FEAT_MultiRoundDiscussion
2 parents 49dfd5a + c48c416 commit f835275

11 files changed

Lines changed: 3113 additions & 3141 deletions

.github/workflows/build_nano_assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
- name: Push Built Files to VCS
3535
uses: stefanzweifel/git-auto-commit-action@v5
3636
with:
37-
commit_message: Built Nano Assetjs
37+
commit_message: Built Nano Assets

.github/workflows/bump_dynamic_dependencies.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ jobs:
2222
- name: Install Build Tools
2323
run: |
2424
python -m pip install build wheel
25-
- name: Increment Version
26-
run: |
27-
VER=$(python setup.py --version)
28-
python version_bump.py -b ${{ github.ref_name }}
2925
- name: Install JS Beautifier
3026
if: github.ref == 'refs/heads/alpha'
3127
run: |
@@ -38,7 +34,7 @@ jobs:
3834
if: github.ref == 'refs/heads/alpha'
3935
working-directory: ./
4036
run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['css'] --skip_files sidebar.css klatchatNano.css --save_to ./css/klatchatNano.css --beautify 0
41-
- name: Push Version Change
37+
- name: Push Static Files
4238
uses: stefanzweifel/git-auto-commit-action@v5
4339
with:
44-
commit_message: Updated Version and Dynamic Dependencies
40+
commit_message: Updated Dynamic Dependencies

.github/workflows/publish_release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ jobs:
1111
uses: ./.github/workflows/build_artifacts.yml
1212
bump-dynamic-dependencies:
1313
uses: ./.github/workflows/bump_dynamic_dependencies.yml
14+
needs: build-artifacts
1415
build-nano-assets:
1516
uses: ./.github/workflows/build_nano_assets.yml
17+
needs: bump-dynamic-dependencies
1618
tag_release:
17-
needs: build-artifacts
19+
needs: build-nano-assets
1820
runs-on: ubuntu-latest
1921
steps:
2022
- uses: actions/checkout@v4

.github/workflows/publish_test_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ jobs:
1616
uses: ./.github/workflows/build_artifacts.yml
1717
bump-dynamic-dependencies:
1818
uses: ./.github/workflows/bump_dynamic_dependencies.yml
19+
needs: build-artifacts
1920
build-nano-assets:
2021
uses: ./.github/workflows/build_nano_assets.yml
22+
needs: bump-dynamic-dependencies
2123
publish_alpha_release:
22-
needs: build-artifacts
24+
needs: build-nano-assets
2325
uses: neongeckocom/.github/.github/workflows/publish_alpha_release.yml@master
2426
secrets: inherit
2527
with:
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Publish updated Docker image
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
tag_alpha:
6+
type: boolean
7+
default: false
8+
description: "If true, publish with additional `alpha` tag"
9+
10+
jobs:
11+
build_and_publish_docker_alpha:
12+
if: ${{ github.event.inputs.tag_alpha == 'true' }}
13+
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
14+
with:
15+
image_tag: "alpha"
16+
include_semver: false
17+
secrets: inherit
18+
build_and_publish_docker:
19+
if: ${{ github.event.inputs.tag_alpha != 'true' }}
20+
uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master
21+
with:
22+
include_semver: false
23+
secrets: inherit

.github/workflows/update_docker_images.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [0.0.2a5](https://github.com/NeonGeckoCom/pyklatchat-client/tree/0.0.2a5) (2025-06-12)
4+
5+
[Full Changelog](https://github.com/NeonGeckoCom/pyklatchat-client/compare/0.0.2a4...0.0.2a5)
6+
7+
**Merged pull requests:**
8+
9+
- Update Docker automation to support "alpha" tagged image builds [\#9](https://github.com/NeonGeckoCom/pyklatchat-client/pull/9) ([NeonDaniel](https://github.com/NeonDaniel))
10+
11+
## [0.0.2a4](https://github.com/NeonGeckoCom/pyklatchat-client/tree/0.0.2a4) (2025-06-12)
12+
13+
[Full Changelog](https://github.com/NeonGeckoCom/pyklatchat-client/compare/0.0.2a3...0.0.2a4)
14+
15+
**Merged pull requests:**
16+
17+
- Fix race condition in GHA [\#8](https://github.com/NeonGeckoCom/pyklatchat-client/pull/8) ([NeonDaniel](https://github.com/NeonDaniel))
18+
319
## [0.0.2a3](https://github.com/NeonGeckoCom/pyklatchat-client/tree/0.0.2a3) (2025-06-10)
420

521
[Full Changelog](https://github.com/NeonGeckoCom/pyklatchat-client/compare/0.0.3a1...0.0.2a3)

chat_client/static/css/klatchatNano.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,4 +438,3 @@ background-color: darkblue;
438438
.modal, .modal-backdrop {
439439
position: absolute !important;
440440
}
441-

0 commit comments

Comments
 (0)