From 461a20e184ee0551619eaa4ddea132d539da40b4 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 14:56:39 +0100 Subject: [PATCH 01/17] Update release to micromamba and renew conda environment to latest conda-forge ressources --- .github/workflows/release.yml | 27 +++++++-- conda_windows.yml | 104 +++++++++++++++++++++------------- windows_build.spec | 37 ++++++++++++ 3 files changed, 124 insertions(+), 44 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d5f2951..a3e1de4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,6 @@ on: jobs: test: - runs-on: ubuntu-latest strategy: matrix: @@ -118,10 +117,30 @@ jobs: uses: actions/setup-python@v5 with: python-version: 3.12 - - name: Install dependencies + - name: Ensure build environment + shell: powershell run: | - C:\Miniconda\condabin\conda.bat env update --file conda_windows.yml --name base - C:\Miniconda\condabin\conda.bat init powershell + $envName="eos_build" + $envFile="conda_windows.yml" + $hashFile="$env:TEMP\$envName.hash" + + $newHash = (Get-FileHash $envFile).Hash + + if (!(Test-Path $hashFile)) { + $rebuild = $true + } else { + $oldHash = Get-Content $hashFile + $rebuild = $oldHash -ne $newHash + } + + if ($rebuild) { + Write-Host "Environment changed → rebuilding" + micromamba env remove -n $envName -y 2>$null + micromamba create -n $envName -f $envFile -y + $newHash | Out-File $hashFile + } else { + Write-Host "Environment unchanged → using cached env" + } - name: Build with pyinstaller run: | pyinstaller windows_build.spec diff --git a/conda_windows.yml b/conda_windows.yml index 9fd9d82..81703d8 100644 --- a/conda_windows.yml +++ b/conda_windows.yml @@ -1,44 +1,68 @@ name: eos_build channels: - - defaults + - conda-forge dependencies: - - altgraph=0.17.3=py312haa95532_0 - - blas=1.0=mkl - - bzip2=1.0.8=h2bbff1b_6 - - ca-certificates=2024.11.26=haa95532_0 - - expat=2.6.3=h5da7b33_0 - - h5py=3.12.1=py312h3b2c811_0 - - hdf5=1.12.1=h51c971a_3 - - icc_rt=2022.1.0=h6049295_2 - - intel-openmp=2023.1.0=h59b6b97_46320 - - libffi=3.4.4=hd77b12b_1 - - llvmlite=0.43.0=py312hf2fb9eb_0 - - mkl=2023.1.0=h6b88ed4_46358 - - mkl-service=2.4.0=py312h2bbff1b_1 - - mkl_fft=1.3.11=py312h827c3e9_0 - - mkl_random=1.2.8=py312h0158946_0 - - numba=0.60.0=py312h0158946_0 - - numpy=1.26.4=py312hfd52020_0 - - numpy-base=1.26.4=py312h4dde369_0 - - openssl=3.0.15=h827c3e9_0 - - packaging=24.1=py312haa95532_0 - - pefile=2023.2.7=py312haa95532_0 - - pip=24.2=py312haa95532_0 - - pyinstaller=6.9.0=py312h0416ee5_0 - - pyinstaller-hooks-contrib=2024.7=py312haa95532_0 - - python=3.12.7=h14ffc60_0 - - pywin32-ctypes=0.2.2=py312haa95532_0 - - setuptools=75.1.0=py312haa95532_0 - - sqlite=3.45.3=h2bbff1b_0 - - tbb=2021.8.0=h59b6b97_0 - - tk=8.6.14=h0416ee5_0 - - tzdata=2024b=h04d1e81_0 - - vc=14.40=h2eaa2aa_1 - - vs2015_runtime=14.40.33807=h98bb1dd_1 - - wheel=0.44.0=py312haa95532_0 - - xz=5.4.6=h8cc25b3_1 - - zlib=1.2.13=h8cc25b3_1 + - altgraph=0.17.5=pyhd8ed1ab_0 + - bzip2=1.0.8=h0ad9c76_9 + - ca-certificates=2026.2.25=h4c7d964_0 + - cached-property=1.5.2=hd8ed1ab_1 + - cached_property=1.5.2=pyha770c72_1 + - flexcache=0.3=pyhd8ed1ab_1 + - flexparser=0.4=pyhd8ed1ab_1 + - future=1.0.0=pyhd8ed1ab_2 + - h5py=3.15.1=nompi_py312h03cd2ba_101 + - hdf5=1.14.6=nompi_hae35d4c_106 + - icu=78.2=h637d24d_0 + - importlib-metadata=8.7.0=pyhe01879c_1 + - krb5=1.22.2=h0ea6238_0 + - libaec=1.1.5=haf901d7_0 + - libblas=3.11.0=5_hf2e6a31_mkl + - libcblas=3.11.0=5_h2a3cdd5_mkl + - libcurl=8.19.0=h8206538_0 + - libexpat=2.7.4=hac47afa_0 + - libffi=3.5.2=h3d046cb_0 + - libhwloc=2.12.2=default_h4379cf1_1000 + - libiconv=1.18=hc1393d2_2 + - liblapack=3.11.0=5_hf9ab0e9_mkl + - liblzma=5.8.2=hfd05255_0 + - libsqlite=3.52.0=hf5d6505_0 + - libssh2=1.11.1=h9aa295b_0 + - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_10 + - libxml2=2.15.2=h779ef1b_0 + - libxml2-16=2.15.2=h3cfd58e_0 + - libzlib=1.3.1=h2466b09_2 + - llvm-openmp=22.1.0=h4fa8253_0 + - llvmlite=0.46.0=py312hdb9728c_0 + - mkl=2025.3.0=hac47afa_455 + - numba=0.64.0=py312h560f1c9_0 + - numpy=2.4.2=py312ha72d056_1 + - openssl=3.6.1=hf411b9b_1 + - packaging=26.0=pyhcf101f3_0 + - pefile=2023.2.7=pyhd8ed1ab_0 + - pint=0.25.2=pyhcf101f3_0 + - pip=26.0.1=pyh8b19718_0 + - platformdirs=4.9.4=pyhcf101f3_0 + - pyinstaller=6.19.0=py312hf4647a0_1 + - pyinstaller-hooks-contrib=2026.2=pyhd8ed1ab_0 + - python=3.12.13=h0159041_0_cpython + - python_abi=3.12=8_cp312 + - pywin32=311=py312h829343e_1 + - pywin32-ctypes=0.2.3=py312h2e8e312_3 + - pyyaml=6.0.3=py312h05f76fc_1 + - setuptools=82.0.1=pyh332efcf_0 + - tabulate=0.10.0=pyhcf101f3_0 + - tbb=2022.3.0=h3155e25_2 + - tk=8.6.13=h6ed50ae_3 + - typing-extensions=4.15.0=h396c80c_0 + - typing_extensions=4.15.0=pyhcf101f3_0 + - ucrt=10.0.26100.0=h57928b3_0 + - vc=14.3=h41ae7f8_34 + - vc14_runtime=14.44.35208=h818238b_34 + - vcomp14=14.44.35208=h818238b_34 + - wheel=0.46.3=pyhd8ed1ab_0 + - yaml=0.2.5=h6a83c73_3 + - zipp=3.23.0=pyhcf101f3_1 + - zstd=1.5.7=h534d264_6 - pip: - - orsopy==1.2.1 - - pyyaml==6.0.2 - - tzdata \ No newline at end of file + - orsopy==1.2.2 + - tzdata diff --git a/windows_build.spec b/windows_build.spec index 4ca0124..a7d95a1 100644 --- a/windows_build.spec +++ b/windows_build.spec @@ -40,10 +40,47 @@ exe = EXE( codesign_identity=None, entitlements_file=None, ) + +a2 = Analysis( + ['eos/ls.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + optimize=1, +) +pyz2 = PYZ(a2.pure) + +exe2 = EXE( + pyz2, + a2.scripts, + [], + exclude_binaries=True, + name='eosls', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=True, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, +) + coll = COLLECT( exe, a.binaries, a.datas, + exe2, + a2.binaries, + a2.datas, strip=False, upx=True, upx_exclude=[], -- 2.54.0 From 931bb1ba48c3711f3ea37d19ce827ba93eb394ca Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 15:33:24 +0100 Subject: [PATCH 02/17] Ignore exit code of env remove in case it doesn't exist --- .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 a3e1de4..8893011 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,7 +135,7 @@ jobs: if ($rebuild) { Write-Host "Environment changed → rebuilding" - micromamba env remove -n $envName -y 2>$null + micromamba env remove -n $envName -y 2>$null || $true micromamba create -n $envName -f $envFile -y $newHash | Out-File $hashFile } else { -- 2.54.0 From 36c43f7ecbaf8e5ae934abdf870e873dd1fba296 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 15:38:01 +0100 Subject: [PATCH 03/17] Retry ignore --- .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 8893011..cf4ae2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,7 +135,9 @@ jobs: if ($rebuild) { Write-Host "Environment changed → rebuilding" - micromamba env remove -n $envName -y 2>$null || $true + if (micromamba env list | Select-String $envName) { + micromamba env remove -n $envName -y 2>$null + } micromamba create -n $envName -f $envFile -y $newHash | Out-File $hashFile } else { -- 2.54.0 From 4ffb988bac0494193916fc3159ca8c1bed4bc6c0 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 15:47:22 +0100 Subject: [PATCH 04/17] Activate environment before running python commands --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cf4ae2a..68a7337 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -145,6 +145,7 @@ jobs: } - name: Build with pyinstaller run: | + micromamba activate eos_build pyinstaller windows_build.spec cd dist\eos Compress-Archive -Path .\* -Destination ..\..\eos.zip -- 2.54.0 From c7e92f7086ce357c582c1ec90fdfc3b02404f5c3 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 15:55:23 +0100 Subject: [PATCH 05/17] Test if workflow runs without cached environment --- .github/workflows/release.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 68a7337..fb40c05 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,27 +122,27 @@ jobs: run: | $envName="eos_build" $envFile="conda_windows.yml" - $hashFile="$env:TEMP\$envName.hash" + #$hashFile="$env:TEMP\$envName.hash" - $newHash = (Get-FileHash $envFile).Hash + #$newHash = (Get-FileHash $envFile).Hash - if (!(Test-Path $hashFile)) { - $rebuild = $true - } else { - $oldHash = Get-Content $hashFile - $rebuild = $oldHash -ne $newHash - } + #if (!(Test-Path $hashFile)) { + # $rebuild = $true + #} else { + # $oldHash = Get-Content $hashFile + # $rebuild = $oldHash -ne $newHash + #} - if ($rebuild) { - Write-Host "Environment changed → rebuilding" - if (micromamba env list | Select-String $envName) { - micromamba env remove -n $envName -y 2>$null - } + #if ($rebuild) { + # Write-Host "Environment changed → rebuilding" + # if (micromamba env list | Select-String $envName) { + # micromamba env remove -n $envName -y 2>$null + # } micromamba create -n $envName -f $envFile -y - $newHash | Out-File $hashFile - } else { - Write-Host "Environment unchanged → using cached env" - } + # $newHash | Out-File $hashFile + #} else { + # Write-Host "Environment unchanged → using cached env" + #} - name: Build with pyinstaller run: | micromamba activate eos_build -- 2.54.0 From 860249299bddc9c258243cdec39768851e719cb1 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 16:13:53 +0100 Subject: [PATCH 06/17] Include release tag extraction needed for last step --- .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 fb40c05..340e606 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,9 +146,12 @@ jobs: - name: Build with pyinstaller run: | micromamba activate eos_build + $env:RELEASE_TAG = (python -c "import eos;print('v'+eos.__version__)") + echo "RELEASE_TAG=$env:RELEASE_TAG" >> $env:GITHUB_ENV + pyinstaller windows_build.spec cd dist\eos - Compress-Archive -Path .\* -Destination ..\..\eos.zip + Compress-Archive -Path .\* -Destination "..\..\eos-$env:RELEASE_TAG.zip" - 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 @@ -156,4 +159,4 @@ jobs: name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: "${{ env.RELEASE_TAG }}" files: |- - eos.zip + "eos-$env:RELEASE_TAG.zip" -- 2.54.0 From 67727adde5a1856cb858e7a7a3bcea5f1ee44588 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Thu, 12 Mar 2026 16:21:34 +0100 Subject: [PATCH 07/17] Remove version from commands, some powershell syntax issues --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 340e606..5363a54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -151,7 +151,7 @@ jobs: pyinstaller windows_build.spec cd dist\eos - Compress-Archive -Path .\* -Destination "..\..\eos-$env:RELEASE_TAG.zip" + Compress-Archive -Path .\* -Destination ..\..\eos.zip - 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 @@ -159,4 +159,4 @@ jobs: name: "Amor-Eos ${{ env.RELEASE_TAG }}" tag_name: "${{ env.RELEASE_TAG }}" files: |- - "eos-$env:RELEASE_TAG.zip" + eos.zip -- 2.54.0 From 8978c06076266790033a91ac3a655a814ead6b05 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 10:21:59 +0100 Subject: [PATCH 08/17] Try reactivating cached environment --- .github/workflows/release.yml | 44 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5363a54..c326df1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,36 +122,40 @@ jobs: run: | $envName="eos_build" $envFile="conda_windows.yml" - #$hashFile="$env:TEMP\$envName.hash" + $hashFile="$env:TEMP\$envName.hash" - #$newHash = (Get-FileHash $envFile).Hash + $newHash = (Get-FileHash $envFile).Hash - #if (!(Test-Path $hashFile)) { - # $rebuild = $true - #} else { - # $oldHash = Get-Content $hashFile - # $rebuild = $oldHash -ne $newHash - #} + if (!(Test-Path $hashFile)) { + $rebuild = $true + } else { + $oldHash = Get-Content $hashFile + $rebuild = $oldHash -ne $newHash + } - #if ($rebuild) { - # Write-Host "Environment changed → rebuilding" - # if (micromamba env list | Select-String $envName) { - # micromamba env remove -n $envName -y 2>$null - # } + if ($rebuild) { + Write-Host "Environment changed → rebuilding" + if (micromamba env list | Select-String $envName) { + micromamba env remove -n $envName -y 2>$null + } micromamba create -n $envName -f $envFile -y - # $newHash | Out-File $hashFile - #} else { - # Write-Host "Environment unchanged → using cached env" - #} + $newHash | Out-File $hashFile + } else { + Write-Host "Environment unchanged → using cached env" + } - name: Build with pyinstaller run: | micromamba activate eos_build $env:RELEASE_TAG = (python -c "import eos;print('v'+eos.__version__)") echo "RELEASE_TAG=$env:RELEASE_TAG" >> $env:GITHUB_ENV - pyinstaller windows_build.spec - cd dist\eos - Compress-Archive -Path .\* -Destination ..\..\eos.zip + echo "Set tag to $env:RELEASE_TAG" + #pyinstaller windows_build.spec + #cd dist\eos + #Compress-Archive -Path .\* -Destination ..\..\eos.zip + - name: Test global env + run: | + echo "Received tag as $env:RELEASE_TAG" - 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 -- 2.54.0 From 6b09c31bd6f40539092d082f884ad5c29c1ccaba Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 10:27:24 +0100 Subject: [PATCH 09/17] Make sure the hash changed to re-trigger environment creation --- conda_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_windows.yml b/conda_windows.yml index 81703d8..3b32472 100644 --- a/conda_windows.yml +++ b/conda_windows.yml @@ -64,5 +64,5 @@ dependencies: - zipp=3.23.0=pyhcf101f3_1 - zstd=1.5.7=h534d264_6 - pip: - - orsopy==1.2.2 - tzdata + - orsopy==1.2.2 -- 2.54.0 From 1151f62c2a0e0997b4c4972633fa5b0764dc3452 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 10:47:55 +0100 Subject: [PATCH 10/17] Try changing syntax to assign GITHUB_ENV --- .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 c326df1..a0f0877 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -147,7 +147,7 @@ jobs: run: | micromamba activate eos_build $env:RELEASE_TAG = (python -c "import eos;print('v'+eos.__version__)") - echo "RELEASE_TAG=$env:RELEASE_TAG" >> $env:GITHUB_ENV + echo "RELEASE_TAG=$env:RELEASE_TAG" | Out-File -FilePath $env:GITHUB_ENV -Append echo "Set tag to $env:RELEASE_TAG" #pyinstaller windows_build.spec -- 2.54.0 From 7e3c3c667686b1b4d3b72619d6ab35b88e3d0f2e Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 10:55:41 +0100 Subject: [PATCH 11/17] Try setting utf-8 for env --- .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 a0f0877..2e58e03 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,13 +146,13 @@ jobs: - name: Build with pyinstaller run: | micromamba activate eos_build + chcp 65001 #set code page to utf-8 $env:RELEASE_TAG = (python -c "import eos;print('v'+eos.__version__)") - echo "RELEASE_TAG=$env:RELEASE_TAG" | Out-File -FilePath $env:GITHUB_ENV -Append - + echo "RELEASE_TAG=$env:RELEASE_TAG" >> $env:GITHUB_ENV echo "Set tag to $env:RELEASE_TAG" #pyinstaller windows_build.spec #cd dist\eos - #Compress-Archive -Path .\* -Destination ..\..\eos.zip + #Compress-Archive -Path .\* -Destination "..\..\eos-$env:RELEASE_TAG.zip" - name: Test global env run: | echo "Received tag as $env:RELEASE_TAG" -- 2.54.0 From 851447b3046652a0a4a93a8db6b02627c3f119c1 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:00:10 +0100 Subject: [PATCH 12/17] release tag in powershell --- .github/workflows/release.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e58e03..3dced77 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -143,12 +143,15 @@ jobs: } else { Write-Host "Environment unchanged → using cached env" } + - name: Determine release tag + shell: powershell + run: | + $tag = micromamba run -n eos_build python -c "import eos; print('v'+eos.__version__)" + $tag = $tag.Trim() + "RELEASE_TAG=$tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Build with pyinstaller run: | micromamba activate eos_build - chcp 65001 #set code page to utf-8 - $env:RELEASE_TAG = (python -c "import eos;print('v'+eos.__version__)") - echo "RELEASE_TAG=$env:RELEASE_TAG" >> $env:GITHUB_ENV echo "Set tag to $env:RELEASE_TAG" #pyinstaller windows_build.spec #cd dist\eos -- 2.54.0 From c041230e20ae6946763090f5677015e56893599b Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:03:06 +0100 Subject: [PATCH 13/17] minor --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3dced77..20ebdee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,15 +150,13 @@ jobs: $tag = $tag.Trim() "RELEASE_TAG=$tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Build with pyinstaller + shell: powershell run: | micromamba activate eos_build echo "Set tag to $env:RELEASE_TAG" #pyinstaller windows_build.spec #cd dist\eos #Compress-Archive -Path .\* -Destination "..\..\eos-$env:RELEASE_TAG.zip" - - name: Test global env - run: | - echo "Received tag as $env:RELEASE_TAG" - 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 -- 2.54.0 From 54c936714e1a78c51347ac1cc4e3f42a29f4269b Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:06:18 +0100 Subject: [PATCH 14/17] minor --- .github/workflows/release.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20ebdee..ee8933a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,7 @@ on: jobs: test: runs-on: ubuntu-latest + if: false strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] @@ -107,7 +108,7 @@ jobs: dist/amor*.tar.gz build-windows: - needs: [test] + #needs: [test] runs-on: windows-latest if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all", "windows", "all_incl_release"]'), github.event.inputs.build-items)) }} @@ -153,10 +154,10 @@ jobs: shell: powershell run: | micromamba activate eos_build - echo "Set tag to $env:RELEASE_TAG" + echo "Set tag to ${{ env.RELEASE_TAG }}" #pyinstaller windows_build.spec #cd dist\eos - #Compress-Archive -Path .\* -Destination "..\..\eos-$env:RELEASE_TAG.zip" + #Compress-Archive -Path .\* -Destination "..\..\eos-${{ env.RELEASE_TAG }}.zip" - 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 -- 2.54.0 From d10647d1e2aa6b1146029642f82836448af8b7f2 Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:07:43 +0100 Subject: [PATCH 15/17] minor --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee8933a..c1f5b89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -151,7 +151,6 @@ jobs: $tag = $tag.Trim() "RELEASE_TAG=$tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Build with pyinstaller - shell: powershell run: | micromamba activate eos_build echo "Set tag to ${{ env.RELEASE_TAG }}" -- 2.54.0 From 2af0c361725ea11e98be394f8907ccdd5ff2abac Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:09:20 +0100 Subject: [PATCH 16/17] minor --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1f5b89..738addf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -151,9 +151,10 @@ jobs: $tag = $tag.Trim() "RELEASE_TAG=$tag" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Build with pyinstaller + shell: powershell run: | micromamba activate eos_build - echo "Set tag to ${{ env.RELEASE_TAG }}" + echo "Set tag to $env:RELEASE_TAG" #pyinstaller windows_build.spec #cd dist\eos #Compress-Archive -Path .\* -Destination "..\..\eos-${{ env.RELEASE_TAG }}.zip" -- 2.54.0 From a237a7db3011339b149eeae04323d8adc9f9814d Mon Sep 17 00:00:00 2001 From: Artur Glavic Date: Fri, 13 Mar 2026 12:15:56 +0100 Subject: [PATCH 17/17] reactivate build --- .github/workflows/release.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 738addf..9d6b2e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,6 @@ on: jobs: test: runs-on: ubuntu-latest - if: false strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] @@ -108,7 +107,7 @@ jobs: dist/amor*.tar.gz build-windows: - #needs: [test] + needs: [test] runs-on: windows-latest if: ${{ (github.event_name != 'workflow_dispatch') || (contains(fromJson('["all", "windows", "all_incl_release"]'), github.event.inputs.build-items)) }} @@ -154,10 +153,9 @@ jobs: shell: powershell run: | micromamba activate eos_build - echo "Set tag to $env:RELEASE_TAG" - #pyinstaller windows_build.spec - #cd dist\eos - #Compress-Archive -Path .\* -Destination "..\..\eos-${{ env.RELEASE_TAG }}.zip" + pyinstaller windows_build.spec + cd dist\eos + Compress-Archive -Path .\* -Destination ..\..\eos.zip - 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 -- 2.54.0