From 439063dacc998f681f1285457ce369fe66557a12 Mon Sep 17 00:00:00 2001 From: Alessio Date: Wed, 13 Mar 2024 19:22:15 -0700 Subject: [PATCH] Add upload step for windows build - Add ssh-agent and known_host for windows SSH upload --- .woodpecker/build.yml | 7 ++++++- .woodpecker/docker/innosetup.dockerfile | 3 +++ .woodpecker/docker/known_hosts | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .woodpecker/docker/known_hosts diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index b769584..72a5289 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -80,13 +80,18 @@ pipeline: - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+") - ./windows-compile.sh $version - windows_package: + windows_package_and_upload: when: branch: release-* image: offline-twitter/innosetup + secrets: + - offline_twatter_id_ecdsa commands: - export version=$(echo $CI_COMMIT_BRANCH | grep -Poh "(?<=^release-)\d+\.\d+\.\d+") - iscc.sh /Dversion=$version /Dexe_path=`winepath -w cmd/twitter.exe` build/windows/setup.iss + - eval $(ssh-agent) + - echo "$OFFLINE_TWATTER_ID_ECDSA" | ssh-add - + - scp build/windows/Output/mysetup.exe offline-twitter@offline-twitter.com:/var/www/offline-twitter.com/downloads/offline-twitter-for-windows.exe depends_on: diff --git a/.woodpecker/docker/innosetup.dockerfile b/.woodpecker/docker/innosetup.dockerfile index 940b6c1..1d63496 100644 --- a/.woodpecker/docker/innosetup.dockerfile +++ b/.woodpecker/docker/innosetup.dockerfile @@ -10,3 +10,6 @@ env DISPLAY ":99" env WINEDEBUG "-all,err+all" run xvfb-run wine is.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES /DOWNLOADISCRYPT=1 copy iscc.sh /usr/bin/iscc.sh + +# For SSH upload +copy known_hosts /root/.ssh/known_hosts diff --git a/.woodpecker/docker/known_hosts b/.woodpecker/docker/known_hosts new file mode 100644 index 0000000..46658b1 --- /dev/null +++ b/.woodpecker/docker/known_hosts @@ -0,0 +1 @@ +|1|oLVG8OogkuOJRgCV4ich/pdRIm8=|OLp/ptsX1+UbNBdRUJn3eGOQ4SA= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAzQ7p29GgUpU8LIGznke+P0md+0jyaplRzyrQpOe7Wv