From 2c3e06c6210407c2ee6157e99b4e06a407532b5c Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:23:54 -0300 Subject: [PATCH 01/16] Allow tracking of *.spec files --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0b12876..9f065ce 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ MANIFEST # Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest -*.spec # Installer logs pip-log.txt From f14c36eaba4e1fa520c9961a92777267c89b58c2 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:25:07 -0300 Subject: [PATCH 02/16] Remove from tracking pyinstaller_versionfile files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 9f065ce..a94022d 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,7 @@ dmypy.json # Cython debug symbols cython_debug/ + +# pyinstaller_versionfile +version.txt +versionfile.txt \ No newline at end of file From 3e77b39f61b193c7cbe3e89e5d39f591f046ca23 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:25:41 -0300 Subject: [PATCH 03/16] Add pyinstaller_versionfile metadata --- metadata.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 metadata.yml diff --git a/metadata.yml b/metadata.yml new file mode 100644 index 0000000..e24752c --- /dev/null +++ b/metadata.yml @@ -0,0 +1,7 @@ +Version: version.txt +CompanyName: LabSid/PHA/EPUSP +FileDescription: Rainfall rUnoff Balance Enhanced Model (RUBEM) +InternalName: rubem +LegalCopyright: © 2020-2023 - LabSid/PHA/EPUSP. All rights reserved. +OriginalFilename: rubem.exe +ProductName: RUBEM \ No newline at end of file From de526d605c7afeb38af70d18c4da7fdcc4322f73 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:26:00 -0300 Subject: [PATCH 04/16] Add rubem.spec --- rubem.spec | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 rubem.spec diff --git a/rubem.spec b/rubem.spec new file mode 100644 index 0000000..859d96f --- /dev/null +++ b/rubem.spec @@ -0,0 +1,48 @@ +# -*- mode: python ; coding: utf-8 -*- + + +block_cipher = None + + +a = Analysis(['./rubem/launcher.py'], + pathex=[], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) + +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) + +exe = EXE(pyz, + a.scripts, + [], + exclude_binaries=True, + name='rubem', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=True, + disable_windowed_traceback=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, + version='versionfile.txt', + icon='./resources/icon/rubem.ico') + +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='rubem') \ No newline at end of file From 4ac4408659cc320f8b471c937ff41ec8b555a4d1 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:26:08 -0300 Subject: [PATCH 05/16] Add icon --- resources/icon/rubem.ico | Bin 0 -> 15561 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/icon/rubem.ico diff --git a/resources/icon/rubem.ico b/resources/icon/rubem.ico new file mode 100644 index 0000000000000000000000000000000000000000..3dace5a887bb385b0023901f6ac76690436170f3 GIT binary patch literal 15561 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 literal 0 HcmV?d00001 From 81c82ac6ec8cabee827a102cb39dbfb02e8407bb Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:26:29 -0300 Subject: [PATCH 06/16] Remove pyproject.toml --- pyproject.toml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 3a849ca..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,23 +0,0 @@ -[tool.poetry] -name = "rubem" -version = "0.1.3" -description = "Rainfall rUnoff Balance Enhanced Model (RUBEM) is a distributed hydrological model to calculate monthly flows with changes in land use over time" -authors = ["LabSid PHA EPUSP "] -license = "GPL v3" -readme = "README.md" -homepage = "http://labsid.eng.br/software.aspx?id=17" -repository = "https://github.com/LabSid-USP/RUBEM" -documentation = "https://rubem.readthedocs.io/en/latest" -keywords = ["remote sensing", "hydrology", "water", "hydrological model"] - -[tool.poetry.urls] -"Bug Tracker" = "https://github.com/LabSid-USP/RUBEM/issues" - -[tool.poetry.dependencies] -python = "^3.9" - -[tool.poetry.dev-dependencies] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" From 2c2202c1535111c3f35bd28bb620977bc3468607 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:27:47 -0300 Subject: [PATCH 07/16] Add global module info in __init__.py --- rubem/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rubem/__init__.py b/rubem/__init__.py index 016a740..e482c69 100644 --- a/rubem/__init__.py +++ b/rubem/__init__.py @@ -25,3 +25,11 @@ from logging import NullHandler logging.getLogger(__name__).addHandler(NullHandler()) + +__author__ = "LabSid PHA EPUSP" +__email__ = "rubem.hydrological@labsid.eng.br" +__copyright__ = "Copyright (C) 2020-2022 - LabSid/PHA/EPUSP" +__license__ = "GPL" +__date__ = "2022-03-23" +__version__ = "0.1.3" +__release__ = "0.1.3" From 17a378937b8984b1cca7e160b160b0532e9a3a9e Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 11:28:21 -0300 Subject: [PATCH 08/16] Add launcher entry point for pyinstaller --- rubem/launcher.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 rubem/launcher.py diff --git a/rubem/launcher.py b/rubem/launcher.py new file mode 100644 index 0000000..7517107 --- /dev/null +++ b/rubem/launcher.py @@ -0,0 +1,7 @@ +# From issue Pyinstaller a package with __main__.py +# https://github.com/pyinstaller/pyinstaller/issues/2560#issuecomment-777257579 + +from rubem.cli import * # noqa + +if __name__ == "__main__": + main() # noqa From 26a0d18a916cde9f30956a1c6ec3e54d6677f32b Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 15:12:01 -0300 Subject: [PATCH 09/16] Add windows build release workflow --- .github/workflows/build-release.yml | 70 +++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/build-release.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..d9b223e --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,70 @@ +name: Build Release +on: + push: + branches: "!*" + tags: "v*" + +jobs: + build: + runs-on: windows-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.10' + + - name: Add conda to system path + run: | + echo $CONDA/bin >> $GITHUB_PATH + - name: Install dependencies + run: | + conda env update --file env-prod.yml --name base + pip install pyinstaller_versionfile + pip install PyInstaller + + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} + + - name: Create Version File + run: | + echo "${{ steps.get_version.outputs.VERSION }}".substring(1) + ".0" > version.txt + create-version-file metadata.yml --outfile versionfile.txt + + - name: Create Package + run: pyinstaller rubem.spec --noconfirm + + - name: Test Package + run: | + ./dist/rubem/rubem -h + + - name: Zip files + run: | + 7z a -tzip -mx=9 -r "dist\rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip" dist\rubem\* + + - name: Test Zip + run: | + 7z t "dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip" + + - name: Compute Hash + run: | + $hash = Get-FileHash -Path dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip -Algorithm SHA512 + echo $hash.Hash $([System.IO.Path]::GetFileName($hash.Path)) > dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip.sha512 + + - name: Create Release + id: create_release + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.get_version.outputs.VERSION }} + name: v${{ steps.get_version.outputs.VERSION }} + files: | + ./dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip + ./dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip.sha512 + draft: false + prerelease: false From e087bdacf00ffa3d4fc9874fafc1346ddfd0523f Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 15:27:27 -0300 Subject: [PATCH 10/16] Fix conda setup in build-release workflow --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index d9b223e..a3e46a3 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2 + uses: conda-incubator/setup-miniconda@v2 with: python-version: '3.10' From 046fa003f2d9443d0c78abb7832ea1b0748399b6 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 16:28:00 -0300 Subject: [PATCH 11/16] Update conda env setup --- .github/workflows/build-release.yml | 14 +--- env-ci.yml | 116 ++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 env-ci.yml diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index a3e46a3..b2002c7 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -15,16 +15,10 @@ jobs: - name: Set up Python uses: conda-incubator/setup-miniconda@v2 with: - python-version: '3.10' - - - name: Add conda to system path - run: | - echo $CONDA/bin >> $GITHUB_PATH - - name: Install dependencies - run: | - conda env update --file env-prod.yml --name base - pip install pyinstaller_versionfile - pip install PyInstaller + activate-environment: rubem-ci + environment-file: env-ci.yml + python-version: 3.10 + auto-activate-base: false - name: Get the version id: get_version diff --git a/env-ci.yml b/env-ci.yml new file mode 100644 index 0000000..dba30ad --- /dev/null +++ b/env-ci.yml @@ -0,0 +1,116 @@ +name: rubem-ci +channels: + - conda-forge + - defaults +dependencies: + - blosc=1.21.4=hdccc3a2_0 + - boost-cpp=1.78.0=h9f4b32c_3 + - bzip2=1.0.8=h8ffe710_4 + - ca-certificates=2023.5.7=h56e8100_0 + - cairo=1.16.0=hdecc03f_1015 + - cfitsio=4.2.0=h9ebe7e4_0 + - curl=8.0.1=h68f0423_0 + - expat=2.5.0=h63175ca_1 + - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 + - font-ttf-inconsolata=3.000=h77eed37_0 + - font-ttf-source-code-pro=2.038=h77eed37_0 + - font-ttf-ubuntu=0.83=hab24e00_0 + - fontconfig=2.14.2=hbde0cde_0 + - fonts-conda-ecosystem=1=0 + - fonts-conda-forge=1=0 + - freetype=2.12.1=h546665d_1 + - freexl=1.0.6=h67ca5e6_1 + - gdal=3.6.4=py39h759b988_2 + - geos=3.11.2=h1537add_0 + - geotiff=1.7.1=h7222e44_8 + - gettext=0.21.1=h5728263_0 + - glib=2.76.2=h12be248_0 + - glib-tools=2.76.2=h12be248_0 + - gst-plugins-base=1.22.0=h001b923_2 + - gstreamer=1.22.0=h6b5321d_2 + - hdf4=4.2.15=h1334946_6 + - hdf5=1.14.0=nompi_h918d9b7_103 + - icu=72.1=h63175ca_0 + - intel-openmp=2023.1.0=h57928b3_46319 + - kealib=1.5.1=h2e80506_0 + - krb5=1.20.1=heb0366b_0 + - lcms2=2.15=h3e3b177_1 + - lerc=4.0.0=h63175ca_0 + - libaec=1.0.6=h63175ca_1 + - libblas=3.9.0=16_win64_mkl + - libcblas=3.9.0=16_win64_mkl + - libclang=16.0.3=default_h8b4101f_0 + - libclang13=16.0.3=default_h45d3cf4_0 + - libcurl=8.0.1=h68f0423_0 + - libdeflate=1.18=hcfcfb64_0 + - libexpat=2.5.0=h63175ca_1 + - libffi=3.4.2=h8ffe710_5 + - libgdal=3.6.4=h36c8192_2 + - libglib=2.76.2=he8f3873_0 + - libhwloc=2.9.1=h51c2c0f_0 + - libiconv=1.17=h8ffe710_0 + - libjpeg-turbo=2.1.5.1=hcfcfb64_0 + - libkml=1.3.0=hf2ab4e4_1015 + - liblapack=3.9.0=16_win64_mkl + - libnetcdf=4.9.2=nompi_hc664c2b_104 + - libogg=1.3.4=h8ffe710_1 + - libpng=1.6.39=h19919ed_0 + - libpq=15.3=ha9684e8_0 + - librttopo=1.1.0=he1da8c1_13 + - libspatialite=5.0.1=h50a8ebb_25 + - libsqlite=3.41.2=hcfcfb64_1 + - libssh2=1.10.0=h9a1e1f7_3 + - libtiff=4.5.0=h6c8260b_6 + - libvorbis=1.3.7=h0e60522_0 + - libwebp-base=1.3.0=hcfcfb64_0 + - libxml2=2.10.4=hc3477c8_0 + - libzip=1.9.2=h519de47_1 + - libzlib=1.2.13=hcfcfb64_4 + - lz4-c=1.9.4=hcfcfb64_0 + - mkl=2022.1.0=h6a75c08_874 + - numpy=1.24.3=py39h816b6a6_0 + - openjpeg=2.5.0=ha2aaf27_2 + - openssl=3.1.0=hcfcfb64_3 + - pandas=1.5.3=py39h2ba5b7c_1 + - pcraster=4.4.0=py39h4c8a3b8_2 + - pcre2=10.40=h17e33f8_0 + - pip=23.1.2=pyhd8ed1ab_0 + - pixman=0.40.0=h8ffe710_0 + - poppler=23.05.0=h45d20d0_1 + - poppler-data=0.4.12=hd8ed1ab_0 + - postgresql=15.3=hd87cd2b_0 + - proj=9.2.0=heca977f_0 + - pthreads-win32=2.9.1=hfa6e2cd_3 + - python=3.9.16=h4de0772_0_cpython + - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python_abi=3.9=3_cp39 + - pytz=2023.3=pyhd8ed1ab_0 + - qt-main=5.15.8=h2c8576c_11 + - setuptools=67.7.2=pyhd8ed1ab_0 + - six=1.16.0=pyh6c4a22f_0 + - snappy=1.1.10=hfb803bf_0 + - sqlite=3.41.2=hcfcfb64_1 + - tbb=2021.9.0=h91493d7_0 + - tiledb=2.13.2=h3132609_0 + - tk=8.6.12=h8ffe710_0 + - tzdata=2023c=h71feb2d_0 + - ucrt=10.0.22621.0=h57928b3_0 + - vc=14.3=hb25d44b_16 + - vc14_runtime=14.34.31931=h5081d32_16 + - vs2015_runtime=14.34.31931=hed1258a_16 + - wheel=0.40.0=pyhd8ed1ab_0 + - xerces-c=3.2.4=h63175ca_2 + - xz=5.2.6=h8d14728_0 + - zlib=1.2.13=hcfcfb64_4 + - zstd=1.5.2=h12be248_6 + - pip: + - altgraph==0.17.3 + - jinja2==3.1.2 + - markupsafe==2.1.2 + - packaging==23.1 + - pefile==2023.2.7 + - pyinstaller==5.11.0 + - pyinstaller-hooks-contrib==2023.3 + - pyinstaller-versionfile==2.1.1 + - pywin32-ctypes==0.2.0 + - pyyaml==6.0 From f4e933b494296e5188e2ada3cd129a6f3265619e Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 16:28:40 -0300 Subject: [PATCH 12/16] Change conda env Python version to 3.9 --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index b2002c7..641ad99 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,7 +17,7 @@ jobs: with: activate-environment: rubem-ci environment-file: env-ci.yml - python-version: 3.10 + python-version: 3.9 auto-activate-base: false - name: Get the version From 5a028f01001f812d7f826e26244679970021d84b Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 16:43:24 -0300 Subject: [PATCH 13/16] Fix tag name in GitHub Action workflow --- .github/workflows/build-release.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 641ad99..fa2d6f6 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -20,13 +20,9 @@ jobs: python-version: 3.9 auto-activate-base: false - - name: Get the version - id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/} - - name: Create Version File run: | - echo "${{ steps.get_version.outputs.VERSION }}".substring(1) + ".0" > version.txt + echo "${{ github.ref_name }}".substring(1) + ".0" > version.txt create-version-file metadata.yml --outfile versionfile.txt - name: Create Package @@ -38,16 +34,16 @@ jobs: - name: Zip files run: | - 7z a -tzip -mx=9 -r "dist\rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip" dist\rubem\* + 7z a -tzip -mx=9 -r "dist\rubem-v${{ github.ref_name }}-win-x86_64.zip" dist\rubem\* - name: Test Zip run: | - 7z t "dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip" + 7z t "dist/rubem-v${{ github.ref_name }}-win-x86_64.zip" - name: Compute Hash run: | - $hash = Get-FileHash -Path dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip -Algorithm SHA512 - echo $hash.Hash $([System.IO.Path]::GetFileName($hash.Path)) > dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip.sha512 + $hash = Get-FileHash -Path dist/rubem-v${{ github.ref_name }}-win-x86_64.zip -Algorithm SHA512 + echo $hash.Hash $([System.IO.Path]::GetFileName($hash.Path)) > dist/rubem-v${{ github.ref_name }}-win-x86_64.zip.sha512 - name: Create Release id: create_release @@ -55,10 +51,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.get_version.outputs.VERSION }} - name: v${{ steps.get_version.outputs.VERSION }} + tag_name: ${{ github.ref_name }} + name: v${{ github.ref_name }} files: | - ./dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip - ./dist/rubem-v${{ steps.get_version.outputs.VERSION }}-win-x86_64.zip.sha512 + ./dist/rubem-v${{ github.ref_name }}-win-x86_64.zip + ./dist/rubem-v${{ github.ref_name }}-win-x86_64.zip.sha512 draft: false prerelease: false From a235b91e9f1cc2faf1bfe4a1ad0878861c85d0e3 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 17:14:50 -0300 Subject: [PATCH 14/16] Fix version.txt creation in build-release workflow --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index fa2d6f6..3c3a266 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -22,7 +22,7 @@ jobs: - name: Create Version File run: | - echo "${{ github.ref_name }}".substring(1) + ".0" > version.txt + Write-Output(("${{ github.ref_name }}" -replace 'v(.*)-.*', '$1') + '.0') > version.txt create-version-file metadata.yml --outfile versionfile.txt - name: Create Package From be1946df9d521f312d7a380b7c4e9f91c3c8b665 Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 17:45:09 -0300 Subject: [PATCH 15/16] Fix names that use tag version --- .github/workflows/build-release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 3c3a266..cc4e3d4 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -34,16 +34,16 @@ jobs: - name: Zip files run: | - 7z a -tzip -mx=9 -r "dist\rubem-v${{ github.ref_name }}-win-x86_64.zip" dist\rubem\* + 7z a -tzip -mx=9 -r "dist\rubem-${{ github.ref_name }}-win-x86_64.zip" dist\rubem\* - name: Test Zip run: | - 7z t "dist/rubem-v${{ github.ref_name }}-win-x86_64.zip" + 7z t "dist/rubem-${{ github.ref_name }}-win-x86_64.zip" - name: Compute Hash run: | - $hash = Get-FileHash -Path dist/rubem-v${{ github.ref_name }}-win-x86_64.zip -Algorithm SHA512 - echo $hash.Hash $([System.IO.Path]::GetFileName($hash.Path)) > dist/rubem-v${{ github.ref_name }}-win-x86_64.zip.sha512 + $hash = Get-FileHash -Path dist/rubem-${{ github.ref_name }}-win-x86_64.zip -Algorithm SHA512 + echo $hash.Hash $([System.IO.Path]::GetFileName($hash.Path)) > dist/rubem-${{ github.ref_name }}-win-x86_64.zip.sha512 - name: Create Release id: create_release @@ -52,9 +52,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ github.ref_name }} - name: v${{ github.ref_name }} + name: ${{ github.ref_name }} files: | - ./dist/rubem-v${{ github.ref_name }}-win-x86_64.zip - ./dist/rubem-v${{ github.ref_name }}-win-x86_64.zip.sha512 + ./dist/rubem-${{ github.ref_name }}-win-x86_64.zip + ./dist/rubem-${{ github.ref_name }}-win-x86_64.zip.sha512 draft: false prerelease: false From cb2c7778ab439b52b5a64982224e652bc512f6ee Mon Sep 17 00:00:00 2001 From: Gabriel Soares <70075435+soaressgabriel@users.noreply.github.com> Date: Wed, 17 May 2023 17:48:12 -0300 Subject: [PATCH 16/16] Fix zip path directory structure --- .github/workflows/build-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index cc4e3d4..5587152 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -34,7 +34,8 @@ jobs: - name: Zip files run: | - 7z a -tzip -mx=9 -r "dist\rubem-${{ github.ref_name }}-win-x86_64.zip" dist\rubem\* + Set-Location -Path .\dist\rubem + 7z a -tzip -mx=9 -r "..\rubem-${{ github.ref_name }}-win-x86_64.zip" .\* - name: Test Zip run: |