From 35915f459c82a63c2ee544a663af1e52fa387206 Mon Sep 17 00:00:00 2001
From: drew2a <for.drew@gmail.com>
Date: Fri, 3 Jun 2022 14:25:35 +0200
Subject: [PATCH 1/2] Add windows_dependencies action

---
 .../actions/windows_dependencies/action.yml   | 36 +++++++++++++++++++
 .github/workflows/pytest.yml                  |  9 ++---
 2 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 .github/actions/windows_dependencies/action.yml

diff --git a/.github/actions/windows_dependencies/action.yml b/.github/actions/windows_dependencies/action.yml
new file mode 100644
index 00000000000..a892811eeb3
--- /dev/null
+++ b/.github/actions/windows_dependencies/action.yml
@@ -0,0 +1,36 @@
+name: windows_dependencies
+description: Setup windows dependencies for Tribler
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Cache Binaries
+      id: cache-binaries
+      uses: actions/cache@v3
+      with:
+        path: cached-bin
+        key: ${{ runner.os }}-cached-bin
+
+    - name: Create bin folder
+      shell: cmd
+      run: |
+        if not exist "cached-bin" mkdir "cached-bin"
+
+    - name: Check Libsodium existence
+      id: check_libsodium
+      uses: andstor/file-existence-action@v1
+      with:
+        files: "cached-bin/libsodium.dll"
+
+    - name: Download Libsodium
+      if: steps.check_libsodium.outputs.files_exists == 'false'
+      shell: cmd
+      run: |
+        C:\msys64\usr\bin\wget.exe -q https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-msvc.zip
+        7z x libsodium-1.0.17-msvc.zip
+        copy .\x64\Release\v141\dynamic\libsodium.dll .\cached-bin\
+
+    - name: Install Libsodium
+      shell: cmd
+      run: |
+        copy .\cached-bin\libsodium.dll C:\Windows\system32\
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 5ba9a443be1..b5cc420107f 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -31,12 +31,9 @@ jobs:
           python-version: ${{inputs.python-version}}
           requirements: requirements-test.txt
 
-      - name: Install Libsodium (win)
-        if: matrix.os == 'windows-latest'
-        run: |
-          C:\msys64\usr\bin\wget.exe -q https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-msvc.zip
-          7z x libsodium-1.0.17-msvc.zip
-          copy ./x64/Release/v141/dynamic/libsodium.dll C:\Windows\system32\
+      - name: Install windows dependencies
+        if: runner.os == 'Windows'
+        uses: ./.github/actions/windows_dependencies
 
       - name: Run Pytest
         run: |

From cbd7ab771ffd361a6b34ab244ae890a0882fa35b Mon Sep 17 00:00:00 2001
From: drew2a <for.drew@gmail.com>
Date: Fri, 3 Jun 2022 16:31:33 +0200
Subject: [PATCH 2/2] Add inputs.libsodium-version

---
 .github/actions/windows_dependencies/action.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/actions/windows_dependencies/action.yml b/.github/actions/windows_dependencies/action.yml
index a892811eeb3..2642d53fe5f 100644
--- a/.github/actions/windows_dependencies/action.yml
+++ b/.github/actions/windows_dependencies/action.yml
@@ -1,5 +1,10 @@
 name: windows_dependencies
 description: Setup windows dependencies for Tribler
+inputs:
+  libsodium-version:
+    default: '1.0.17'
+    description: 'Libsodium version'
+    required: false
 
 runs:
   using: 'composite'
@@ -20,17 +25,18 @@ runs:
       id: check_libsodium
       uses: andstor/file-existence-action@v1
       with:
-        files: "cached-bin/libsodium.dll"
+        files: "cached-bin/libsodium-${{inputs.libsodium-version}}/libsodium.dll"
 
     - name: Download Libsodium
       if: steps.check_libsodium.outputs.files_exists == 'false'
       shell: cmd
       run: |
-        C:\msys64\usr\bin\wget.exe -q https://download.libsodium.org/libsodium/releases/libsodium-1.0.17-msvc.zip
-        7z x libsodium-1.0.17-msvc.zip
-        copy .\x64\Release\v141\dynamic\libsodium.dll .\cached-bin\
+        C:\msys64\usr\bin\wget.exe -q https://download.libsodium.org/libsodium/releases/libsodium-${{inputs.libsodium-version}}-msvc.zip
+        7z x libsodium-${{inputs.libsodium-version}}-msvc.zip
+        if not exist "cached-bin\libsodium-${{inputs.libsodium-version}}" mkdir "cached-bin\libsodium-${{inputs.libsodium-version}}"
+        copy .\x64\Release\v141\dynamic\libsodium.dll .\cached-bin\libsodium-${{inputs.libsodium-version}}\libsodium.dll
 
     - name: Install Libsodium
       shell: cmd
       run: |
-        copy .\cached-bin\libsodium.dll C:\Windows\system32\
+        copy .\cached-bin\libsodium-${{inputs.libsodium-version}}\libsodium.dll C:\Windows\system32\