From 2370cafd56652eecbe451be92c94cfe6d577b60d Mon Sep 17 00:00:00 2001 From: drew2a Date: Thu, 23 Jun 2022 13:20:03 +0200 Subject: [PATCH] Test password --- .github/workflows/build_windows.yml | 15 +++++++++++++-- build/win/makedist_win.bat | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 58e03f4fb3e..81fee2bbd08 100644 --- 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/build/win/makedist_win.bat b/build/win/makedist_win.bat index f44fd151cc0..ff2f6495248 100644 --- a/build/win/makedist_win.bat +++ b/build/win/makedist_win.bat @@ -91,3 +91,5 @@ 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 ) + +exit 0 \ No newline at end of file