From 5cbb2481b250f06975b49669cf3297952f708b0e Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 27 Feb 2026 14:36:49 +0100 Subject: [PATCH] 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'