From 5cbb2481b250f06975b49669cf3297952f708b0e Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 14:36:49 +0100 Subject: [PATCH 01/20] Try fixing release by using multiple release actions trying to update the files --- .github/workflows/release.yml | 85 ++++++++++++++--------------------- eos/__init__.py | 2 +- 2 files changed, 35 insertions(+), 52 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c941c7b..0f73cae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,63 +69,46 @@ jobs: - name: Build PyPI package run: | python3 -m build -# - name: Archive distribution -# uses: actions/upload-artifact@v3 -# with: -# name: linux-dist -# path: | -# dist/*.tar.gz - name: Upload to PyPI run: | twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} --skip-existing - - build-windows: - needs: [test] - runs-on: windows-latest - if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all", "windows", "all_incl_release"]'), github.event.inputs.build-items)) }} - - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 + - name: Update Release + uses: actions/gitea-release-action@v1 with: - python-version: 3.12 - - name: Install dependencies - run: | - C:\Miniconda\condabin\conda.bat env update --file conda_windows.yml --name base - C:\Miniconda\condabin\conda.bat init powershell - - name: Build with pyinstaller - run: | - pyinstaller windows_build.spec - cd dist\eos - Compress-Archive -Path .\* -Destination ..\..\eos.zip - - name: Archive distribution - uses: actions/upload-artifact@v3 - with: - name: windows-dist - path: | - eos.zip + files: |- + dist/amor*.tar.gz + +# build-windows: +# needs: [test] +# runs-on: windows-latest +# if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all", "windows", "all_incl_release"]'), github.event.inputs.build-items)) }} +# +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Python +# uses: actions/setup-python@v5 +# with: +# python-version: 3.12 +# - name: Install dependencies +# run: | +# C:\Miniconda\condabin\conda.bat env update --file conda_windows.yml --name base +# C:\Miniconda\condabin\conda.bat init powershell +# - name: Build with pyinstaller +# run: | +# pyinstaller windows_build.spec +# cd dist\eos +# Compress-Archive -Path .\* -Destination ..\..\eos.zip +# - name: Archive distribution +# uses: actions/upload-artifact@v3 +# with: +# name: windows-dist +# path: | +# eos.zip release: if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} runs-on: ubuntu-latest - needs: [build-ubuntu-latest, build-windows] + needs: [test] steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - fetch-tags: true - - uses: actions/download-artifact@v3 - with: - name: linux-dist - - uses: actions/download-artifact@v3 - with: - name: windows-dist - - name: get latest version tag - run: echo "RELEASE_TAG=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV - - uses: ncipollo/release-action@v1 - with: - artifacts: "amor*.tar.gz,*.zip" - token: ${{ secrets.GITHUB_TOKEN }} - allowUpdates: true - tag: ${{ env.RELEASE_TAG }} + - name: Create Release + uses: actions/gitea-release-action@v1 diff --git a/eos/__init__.py b/eos/__init__.py index 8d1c3a1..8eb195e 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -2,5 +2,5 @@ Package to handle data redction at AMOR instrument to be used by __main__.py script. """ -__version__ = '3.2.2' +__version__ = '3.2.3' __date__ = '2026-02-27' -- 2.49.1 From 16e729ff1375ddcf9560a74090be927b6b38d1b9 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 15:38:49 +0100 Subject: [PATCH 02/20] try disable pytest plugin autoload --- .github/workflows/unit_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 05395e5..1d0b2b2 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -35,4 +35,5 @@ jobs: - name: Test with pytest run: | + export PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 python -m pytest tests -- 2.49.1 From 53ae715e048be427e3a8397b0fab6bcf78f7337c Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 15:40:57 +0100 Subject: [PATCH 03/20] readd 3.11 --- .github/workflows/release.yml | 3 ++- .github/workflows/unit_tests.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0f73cae..3b58b55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] fail-fast: false steps: @@ -46,6 +46,7 @@ jobs: - name: Test with pytest run: | + export PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 python -m pytest tests diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 1d0b2b2..5a85a7f 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] fail-fast: false steps: -- 2.49.1 From 4e8f42da0a4668ae61dbb2ea404c5d2ac5a05157 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 15:59:58 +0100 Subject: [PATCH 04/20] minor adjustments --- .github/workflows/release.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b58b55..6ba2fbf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,6 +74,7 @@ jobs: run: | twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} --skip-existing - name: Update Release + if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: files: |- @@ -99,11 +100,11 @@ jobs: # pyinstaller windows_build.spec # cd dist\eos # Compress-Archive -Path .\* -Destination ..\..\eos.zip -# - name: Archive distribution -# uses: actions/upload-artifact@v3 +# - name: Update Release +# if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} +# uses: actions/gitea-release-action@v1 # with: -# name: windows-dist -# path: | +# files: |- # eos.zip release: @@ -111,5 +112,14 @@ jobs: runs-on: ubuntu-latest needs: [test] steps: + - uses: actions/checkout@v4 + - name: get latest version tag and release note + run: | + echo "RELEASE_TAG=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV + echo "RELEASE_NOTE='This is a test note.'" >> $GITHUB_ENV - name: Create Release uses: actions/gitea-release-action@v1 + with: + tag_name: ${{ env.RELEASE_TAG }} + prerelease: true + body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From a27aeb47ca6f024cae5e679af30bb083fa2a254d Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 16:22:11 +0100 Subject: [PATCH 05/20] Try to automatically compute release notes --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ba2fbf..0b7763d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,8 +115,11 @@ jobs: - uses: actions/checkout@v4 - name: get latest version tag and release note run: | - echo "RELEASE_TAG=$(git describe --abbrev=0 --tags)" >> $GITHUB_ENV - echo "RELEASE_NOTE='This is a test note.'" >> $GITHUB_ENV + this_tag=$(git describe --abbrev=0 --tags) + prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) + commit_messages==$'Commits since previous release: \n\n'$(git log $this_tag..$prev_tag --pretty=format:"* %s") + echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV + echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - name: Create Release uses: actions/gitea-release-action@v1 with: -- 2.49.1 From 2b32788bdad52dd42ccb3b866e9271fe9f43d3f2 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 16:40:52 +0100 Subject: [PATCH 06/20] try using current version for release tag --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b7763d..0c01f27 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,10 +73,13 @@ jobs: - name: Upload to PyPI run: | twine upload dist/* -u __token__ -p ${{ secrets.PYPI_TOKEN }} --skip-existing + this_tag=$(python -c "import eos;print('v'+eos.__version__)") + echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV - name: Update Release if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: + tag_name: ${{ env.RELEASE_TAG }} files: |- dist/amor*.tar.gz @@ -115,9 +118,9 @@ jobs: - uses: actions/checkout@v4 - name: get latest version tag and release note run: | - this_tag=$(git describe --abbrev=0 --tags) + this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) - commit_messages==$'Commits since previous release: \n\n'$(git log $this_tag..$prev_tag --pretty=format:"* %s") + commit_messages==$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - name: Create Release -- 2.49.1 From 6a06e7afe7feb25fb0e07141d944ae6d2807a37c Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 16:47:29 +0100 Subject: [PATCH 07/20] try fixing git could not describe commits --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c01f27..d9ab5df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -118,6 +118,7 @@ jobs: - uses: actions/checkout@v4 - name: get latest version tag and release note run: | + git fetch --depth=500 this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) commit_messages==$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") @@ -126,6 +127,7 @@ jobs: - name: Create Release uses: actions/gitea-release-action@v1 with: + name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} prerelease: true body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From 145f69878497289ef9fa933dae7431d7a0dd0e6e Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 16:52:12 +0100 Subject: [PATCH 08/20] debug failure in bash script --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9ab5df..a0628bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,7 +121,9 @@ jobs: git fetch --depth=500 this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) - commit_messages==$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") + echo "Relese tag $this_tag with changes since $prev_tag" + commit_messages==$(git log $prev_tag..HEAD --pretty=format:"* %s") + echo "Commit messages: $commit_messages" echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - name: Create Release -- 2.49.1 From fdc46a82c0c66965af10006f58bce58c54a76af7 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 16:55:24 +0100 Subject: [PATCH 09/20] remove double equals sign --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0628bb..bc20167 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,7 +122,7 @@ jobs: this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) echo "Relese tag $this_tag with changes since $prev_tag" - commit_messages==$(git log $prev_tag..HEAD --pretty=format:"* %s") + commit_messages=$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") echo "Commit messages: $commit_messages" echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV -- 2.49.1 From ac1775ddf3728447e0992fc473f6a48727cff42a Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 17:00:02 +0100 Subject: [PATCH 10/20] minor + help --- .github/workflows/release.yml | 4 ++-- update.md | 31 +++++++++++++++---------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc20167..3c50acb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,6 +79,7 @@ jobs: if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: + name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} files: |- dist/amor*.tar.gz @@ -122,7 +123,7 @@ jobs: this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) echo "Relese tag $this_tag with changes since $prev_tag" - commit_messages=$'Commits since previous release: \n\n'$(git log $prev_tag..HEAD --pretty=format:"* %s") + commit_messages=$(git log $prev_tag..HEAD --pretty=format:"* %s") echo "Commit messages: $commit_messages" echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV @@ -131,5 +132,4 @@ jobs: with: name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} - prerelease: true body: ${{ env.RELEASE_NOTE }} diff --git a/update.md b/update.md index e7f3c6a..954e27d 100644 --- a/update.md +++ b/update.md @@ -1,16 +1,15 @@ -Make new release -================ - -- Update revision in `eos/__init__.py` -- Commit changes `git commit -a -m "your message here"` -- Tag version `git tag v3.x.y` -- Push changes `git push` and `git push --tags` -- This should trigger the **Release** action on GitHub that builds a new version and uploads it to PyPI. - - -Update on AMOR -============== - -- Login via SSH using the **amor** user. -- Activate eos virtual environment `source /home/software/virtualenv/eosenv/bin/activate` -- Update eos packge `pip install --upgrade amor-eos` +Make new release +================ + +- Update revision in `eos/__init__.py` +- Commit changes `git commit -a -m "your message here"` +- Push changes `git push` and `git push --tags` +- Use the **Release** action on Gitea with option "all_incl_release", that builds a new version and uploads it to PyPI. + + +Update on AMOR-DR +================= + +- Login via SSH using the **amor-dr** user. +- Activate eos virtual environment `source /home/software/virtualenv/eosenv/bin/activate` +- Update eos packge `pip install --upgrade amor-eos` -- 2.49.1 From 5f75b4b925907c27cb80dcd725405440a0846a55 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 10:07:55 +0100 Subject: [PATCH 11/20] tryp to simplify to see why we're getting internal server error --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c50acb..3b299ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: - name: "Amor-Eos ${{ env.RELEASE_TAG }}" + #name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} files: |- dist/amor*.tar.gz @@ -130,6 +130,6 @@ jobs: - name: Create Release uses: actions/gitea-release-action@v1 with: - name: "Amor-Eos ${{ env.RELEASE_TAG }}" + #name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} - body: ${{ env.RELEASE_NOTE }} + #body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From 5cbaf8326219be8a3107faaf4b035de427a72ea4 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 10:22:22 +0100 Subject: [PATCH 12/20] remove all tag stuff to test if release still works --- .github/workflows/release.yml | 4 ++-- update.md | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b299ce..e1dc05c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: uses: actions/gitea-release-action@v1 with: #name: "Amor-Eos ${{ env.RELEASE_TAG }}" - tag_name: ${{ env.RELEASE_TAG }} + #tag_name: ${{ env.RELEASE_TAG }} files: |- dist/amor*.tar.gz @@ -131,5 +131,5 @@ jobs: uses: actions/gitea-release-action@v1 with: #name: "Amor-Eos ${{ env.RELEASE_TAG }}" - tag_name: ${{ env.RELEASE_TAG }} + #tag_name: ${{ env.RELEASE_TAG }} #body: ${{ env.RELEASE_NOTE }} diff --git a/update.md b/update.md index 954e27d..f058786 100644 --- a/update.md +++ b/update.md @@ -3,8 +3,9 @@ Make new release - Update revision in `eos/__init__.py` - Commit changes `git commit -a -m "your message here"` -- Push changes `git push` and `git push --tags` -- Use the **Release** action on Gitea with option "all_incl_release", that builds a new version and uploads it to PyPI. +- Push changes `git push` +- Use the workflow dispatch for [**Release**](https://gitea.psi.ch/sinq-reflectometry/eos/actions?workflow=release.yml&actor=0&status=0) action + on Gitea with option "all_incl_release", that builds a new version, releases it and uploads it to PyPI. Update on AMOR-DR -- 2.49.1 From 453ab19a4293076e2f333a5af4bc5712604ae1f9 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 10:50:07 +0100 Subject: [PATCH 13/20] readd name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1dc05c..6fab6d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,6 +130,6 @@ jobs: - name: Create Release uses: actions/gitea-release-action@v1 with: - #name: "Amor-Eos ${{ env.RELEASE_TAG }}" + name: "Amor-Eos ${{ env.RELEASE_TAG }}" #tag_name: ${{ env.RELEASE_TAG }} #body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From 616ed44dfea3b291135331402f4cc2e121167fbb Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 10:56:35 +0100 Subject: [PATCH 14/20] move release first and readd tag_name --- .github/workflows/release.yml | 45 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fab6d5..8b1b003 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,6 +49,28 @@ jobs: export PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 python -m pytest tests + release: + if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} + runs-on: ubuntu-latest + needs: [test] + steps: + - uses: actions/checkout@v4 + - name: get latest version tag and release note + run: | + git fetch --depth=500 + this_tag=$(python -c "import eos;print('v'+eos.__version__)") + prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) + echo "Relese tag $this_tag with changes since $prev_tag" + commit_messages=$(git log $prev_tag..HEAD --pretty=format:"* %s") + echo "Commit messages: $commit_messages" + echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV + echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV + - name: Create Release + uses: actions/gitea-release-action@v1 + with: + name: "Amor-Eos ${{ env.RELEASE_TAG }}" + tag_name: ${{ env.RELEASE_TAG }} + #body: ${{ env.RELEASE_NOTE }} build-ubuntu-latest: needs: [test] @@ -110,26 +132,3 @@ jobs: # with: # files: |- # eos.zip - - release: - if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} - runs-on: ubuntu-latest - needs: [test] - steps: - - uses: actions/checkout@v4 - - name: get latest version tag and release note - run: | - git fetch --depth=500 - this_tag=$(python -c "import eos;print('v'+eos.__version__)") - prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) - echo "Relese tag $this_tag with changes since $prev_tag" - commit_messages=$(git log $prev_tag..HEAD --pretty=format:"* %s") - echo "Commit messages: $commit_messages" - echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV - echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - - name: Create Release - uses: actions/gitea-release-action@v1 - with: - name: "Amor-Eos ${{ env.RELEASE_TAG }}" - #tag_name: ${{ env.RELEASE_TAG }} - #body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From c76442ecc55ec77549d068438ea170c56bbba196 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:00:46 +0100 Subject: [PATCH 15/20] try just tag_name without name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b1b003..dce215d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: - name: Create Release uses: actions/gitea-release-action@v1 with: - name: "Amor-Eos ${{ env.RELEASE_TAG }}" + #name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: ${{ env.RELEASE_TAG }} #body: ${{ env.RELEASE_NOTE }} -- 2.49.1 From 288d78e0075471ca2e00d2c94180e49d5b55b7bd Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:19:33 +0100 Subject: [PATCH 16/20] test hard coded tag name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dce215d..1e4617e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -69,7 +69,7 @@ jobs: uses: actions/gitea-release-action@v1 with: #name: "Amor-Eos ${{ env.RELEASE_TAG }}" - tag_name: ${{ env.RELEASE_TAG }} + tag_name: "test_tag" #body: ${{ env.RELEASE_NOTE }} build-ubuntu-latest: -- 2.49.1 From 7c8e9081921cfbd97e6023fa0c28708aa7aa0f43 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:24:35 +0100 Subject: [PATCH 17/20] try enclose tag in double quotes --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e4617e..a0578b7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,8 +68,8 @@ jobs: - name: Create Release uses: actions/gitea-release-action@v1 with: - #name: "Amor-Eos ${{ env.RELEASE_TAG }}" - tag_name: "test_tag" + name: "Amor-Eos ${{ env.RELEASE_TAG }}" + tag_name: "${{ env.RELEASE_TAG }}" #body: ${{ env.RELEASE_NOTE }} build-ubuntu-latest: @@ -101,8 +101,8 @@ jobs: if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} uses: actions/gitea-release-action@v1 with: - #name: "Amor-Eos ${{ env.RELEASE_TAG }}" - #tag_name: ${{ env.RELEASE_TAG }} + name: "Amor-Eos ${{ env.RELEASE_TAG }}" + tag_name: "${{ env.RELEASE_TAG }}" files: |- dist/amor*.tar.gz -- 2.49.1 From 7f4f53e8e8b8d438c0abfe6d90dd782df7e29b3b Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:29:50 +0100 Subject: [PATCH 18/20] try to rename version to see if this is the cause of failure --- eos/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/__init__.py b/eos/__init__.py index 8eb195e..ad41303 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -2,5 +2,5 @@ Package to handle data redction at AMOR instrument to be used by __main__.py script. """ -__version__ = '3.2.3' +__version__ = '3.2.3-1' __date__ = '2026-02-27' -- 2.49.1 From 4abe08caa2b12325074b9449df83734110fe704f Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:44:07 +0100 Subject: [PATCH 19/20] Add commit messages written to file first --- .github/workflows/release.yml | 11 +++++++---- eos/__init__.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0578b7..dd1f9be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,16 +61,17 @@ jobs: this_tag=$(python -c "import eos;print('v'+eos.__version__)") prev_tag=$(git describe --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1`) echo "Relese tag $this_tag with changes since $prev_tag" - commit_messages=$(git log $prev_tag..HEAD --pretty=format:"* %s") - echo "Commit messages: $commit_messages" + echo "Changes: + " > git_changes.log + git log $prev_tag..HEAD --pretty=format:"* %s" >> git_changes.log + cat git_changes.log echo "RELEASE_TAG=$this_tag" >> $GITHUB_ENV - echo "RELEASE_NOTE=$commit_messages" >> $GITHUB_ENV - name: Create Release uses: actions/gitea-release-action@v1 with: name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: "${{ env.RELEASE_TAG }}" - #body: ${{ env.RELEASE_NOTE }} + body_path: git_changes.log build-ubuntu-latest: needs: [test] @@ -130,5 +131,7 @@ jobs: # if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all_incl_release"]'), github.event.inputs.build-items)) }} # uses: actions/gitea-release-action@v1 # with: +# name: "Amor-Eos ${{ env.RELEASE_TAG }}" +# tag_name: "${{ env.RELEASE_TAG }}" # files: |- # eos.zip diff --git a/eos/__init__.py b/eos/__init__.py index ad41303..730ba1d 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -2,5 +2,5 @@ Package to handle data redction at AMOR instrument to be used by __main__.py script. """ -__version__ = '3.2.3-1' +__version__ = '3.2.3-2' __date__ = '2026-02-27' -- 2.49.1 From 2787f5374754bf10e26f773b6db2402e72b3a598 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Mon, 2 Mar 2026 11:58:30 +0100 Subject: [PATCH 20/20] add new action that runs when PR is merged --- .github/workflows/merge_PR.yml | 17 +++++++++++++++++ .github/workflows/release.yml | 2 +- eos/__init__.py | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/merge_PR.yml diff --git a/.github/workflows/merge_PR.yml b/.github/workflows/merge_PR.yml new file mode 100644 index 0000000..9c3f360 --- /dev/null +++ b/.github/workflows/merge_PR.yml @@ -0,0 +1,17 @@ +name: Pull Request Merged +on: + pull_request: + types: [closed] + +jobs: + autoupdate_minor: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.12' + - name: Install dependencies + run: | + python -c "import eos; print(eos.__version__)" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd1f9be..f55c42e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - fail-fast: false + fail-fast: true steps: - name: Checkout LFS objects diff --git a/eos/__init__.py b/eos/__init__.py index 730ba1d..6cd02b8 100644 --- a/eos/__init__.py +++ b/eos/__init__.py @@ -2,5 +2,5 @@ Package to handle data redction at AMOR instrument to be used by __main__.py script. """ -__version__ = '3.2.3-2' +__version__ = '3.2.4' __date__ = '2026-02-27' -- 2.49.1