aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brunschwig <[email protected]>2021-05-10 16:54:15 +0200
committerPatrick Brunschwig <[email protected]>2021-05-10 16:54:15 +0200
commit292f00b01dd6f498cda3f75768861c0f215580fd (patch)
tree50483a6b5eb5518d145caaf7191364d5d2976f23
parent688f72064560e2412c728d122049af30cc2ed719 (diff)
downloadenigmail-292f00b01dd6f498cda3f75768861c0f215580fd.tar.gz
enigmail-292f00b01dd6f498cda3f75768861c0f215580fd.tar.bz2
enigmail-292f00b01dd6f498cda3f75768861c0f215580fd.zip
use gpg4win installer instead of portable GnuPG
-rw-r--r--.gitlab-ci.yml4
-rwxr-xr-xprovisioning/wine-setup.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3732141..e98f0d30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,9 +85,9 @@ postbox_test:
- unzip postbox.zip
- curl -o perl.zip https://enigmail.net/unit-testing/MiniPerl-5.30.zip
- unzip perl.zip
- - curl -o gnupg-inst.7z https://enigmail.net/unit-testing/gnupg-portable-win32-2.2.17-4.7z
- - 7z x -y gnupg-inst.7z
+ - curl -o gpg4win.exe https://files.gpg4win.org/gpg4win-3.1.15.exe
- provisioning/wine-setup.sh
+ - wine gpg4win.exe /S
script:
- mkdir tmp
diff --git a/provisioning/wine-setup.sh b/provisioning/wine-setup.sh
index c8680c28..df544f13 100755
--- a/provisioning/wine-setup.sh
+++ b/provisioning/wine-setup.sh
@@ -17,7 +17,7 @@ mkdir -p $PARENTDIR/test-profile/extensions
ln -s $(pwd) $PARENTDIR/enigmail-src
ln -s $(pwd)/Postbox $PARENTDIR/Postbox
ln -s $(pwd)/Perl $PARENTDIR/Perl
-ln -s $(pwd)/app/bin $HOME/.wine/drive_c/gnupg
+#ln -s $(pwd)/app/bin $HOME/.wine/drive_c/gnupg
echo "C:\\\\Enigmail\\\\enigmail-src\\\\build-pbx\\\\dist\\\\" > "$PARENTDIR/test-profile/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}"
cat << EOT > "$PARENTDIR/test-profile/prefs.js"