diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-10 11:13:08 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-10 11:13:08 +0000 |
commit | 9a5a4b27cb3c911f0c8ea622f183038b409de792 (patch) | |
tree | f16fe350773078608d57119ebe950c5d2793db46 /.github/workflows | |
parent | Releasing debian version 2.1.2~dev0+20230918-1. (diff) | |
download | deluge-9a5a4b27cb3c911f0c8ea622f183038b409de792.tar.xz deluge-9a5a4b27cb3c911f0c8ea622f183038b409de792.zip |
Merging upstream version 2.1.2~dev0+20231127.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/cd.yml | 11 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8a99733..8ef9010 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -84,12 +84,13 @@ jobs: run: | pyinstaller --clean delugewin.spec --distpath freeze - - name: Fix OpenSSL for libtorrent x64 - if: ${{ matrix.arch == 'x64' }} - working-directory: packaging/win/freeze/Deluge + - name: Verify Deluge exes + working-directory: packaging/win/freeze/Deluge/ run: | - cp libssl-1_1.dll libssl-1_1-x64.dll - cp libcrypto-1_1.dll libcrypto-1_1-x64.dll + deluge-debug.exe -v + deluged-debug.exe -v + deluge-web-debug.exe -v + deluge-console -v - name: Make Deluge Installer working-directory: ./packaging/win diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fc6b5b..1f0675c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: Install dependencies run: | pip install --upgrade pip wheel setuptools - pip install -r requirements.txt -r requirements-tests.txt + pip install -r requirements-ci.txt pip install -e . - name: Install security dependencies @@ -92,7 +92,7 @@ jobs: - name: Install dependencies run: | pip install --upgrade pip wheel setuptools - pip install -r requirements.txt -r requirements-tests.txt + pip install -r requirements-ci.txt pip install -e . - name: Test with pytest |