Merge pull request #6946 from Tribler/feature/sign_win_build

Add the sign step to the windows build
Tribler · Jun 29, 2022 · 1a4e89b · 1a4e89b
2 parents 3dbc6cb + ce19814
commit 1a4e89b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -40,6 +40,7 @@ on:
 
 jobs:
  build:
+ environment: build
  runs-on: ${{ github.event.inputs.os || inputs.os }}
 
  steps:
@@ -51,6 +52,7 @@ jobs:
  - name: Modify PATH
  run: |
  echo "C:\msys64\usr\bin" >> $env:GITHUB_PATH
+ echo "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64" >> $env:GITHUB_PATH
 
  - uses: actions/setup-python@v3
  with:
@@ -64,6 +66,14 @@ jobs:
  - name: Install windows dependencies
  uses: ./.github/actions/windows_dependencies
 
+ - name: Restore certificate
+ shell: bash
+ env:
+ CERTIFICATE_BASE64: ${{ secrets.WINDOWS_CERTIFICATE }}
+ run: |
+ echo $CERTIFICATE_BASE64 | base64 --decode > certificate.pfx
+ ls -l certificate.pfx
+
  - name: Prepare files
  env:
  SENTRY_URL: ${{secrets.SENTRY_URL}}
@@ -75,10 +85,11 @@ jobs:
  - name: Collect required binaries
  shell: cmd
  run: |
- mkdir C:\build\
+ mkdir C:\build\certs
  wget -q https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe
  move vc_redist.x64.exe C:\build\vc_redist_140.exe
  copy C:\Windows\system32\libsodium.dll C:\build\
+ move certificate.pfx C:\build\certs\
 
  - name: Install NSIS plugins
  env:
@@ -107,8 +118,8 @@ jobs:
  QT_QPA_PLATFORM: offscreen
  QT_ACCESSIBILITY: 1
  QT_IM_MODULE: ibus
- SKIP_SIGNING_TRIBLER_BINARIES: 'yes please'
  LOG_LEVEL: INFO
+ PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
  shell: cmd
  run: |
  ./build/win/makedist_win.bat

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -25,7 +25,7 @@ jobs:
  requirements: requirements-test.txt
 
  - name: Run Pytest with Coverage
- timeout-minutes: 7
+ timeout-minutes: 10
  run: |
  coverage run --source=./src/tribler/core -p -m pytest ./src/tribler/core --looptime
  coverage run --source=./src/tribler/core -p -m pytest ./src/tribler/core/components/tunnel/tests/test_full_session --tunneltests --looptime

diff --git a/build/win/makedist_win.bat b/build/win/makedist_win.bat
@@ -91,3 +91,6 @@ REM Arno: Sign installer
 if not defined SKIP_SIGNING_TRIBLER_BINARIES (
  signtool.exe sign /f c:\build\certs\certificate.pfx /p "%PASSWORD%" /d "Tribler" /t "http://timestamp.digicert.com" Tribler_*.exe
 )
+
+REM to neglect error code from the previous command we do exit 0
+exit 0