Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-13 08:19:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't import signing keys in a separate task, and fix paths in the cygwin task

Browse Source
This commit is contained in:
Micah Lee 2022-05-29 11:57:54 -07:00
parent 8693eb7c2f
commit 75d6f10f30
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.circleci/config.yml
View File

@ -106,8 +106,8 @@ jobs:
name: Install cygwin and required packages name: Install cygwin and required packages
shell: bash.exe --login -eo pipefail shell: bash.exe --login -eo pipefail
command: | command: |
if [[ -d "/cygdrive/c/Users/circleci/build/libevent" ]]; then if [[ -d "/c/Users/circleci/build/libevent" ]]; then
if [[ -d "/cygdrive/c/Users/circleci/build/tor" ]]; then if [[ -d "/c/Users/circleci/build/tor" ]]; then
echo "libevent and tor already compiled, skipping" echo "libevent and tor already compiled, skipping"
exit 0 exit 0
fi fi
@ -126,21 +126,6 @@ jobs:
./setup-x86_64.exe -q -s https://mirrors.kernel.org/sourceware/cygwin/ -P libssl-devel,git,gcc-core,make,autoconf,automake,libtool,gnupg ./setup-x86_64.exe -q -s https://mirrors.kernel.org/sourceware/cygwin/ -P libssl-devel,git,gcc-core,make,autoconf,automake,libtool,gnupg
# Import libevent and tor signing keys
- run:
name: Import libevent and tor signing keys
shell: C:\\cygwin64\\bin\\bash.exe --login -eo pipefail
command: |
if [[ -d "/cygdrive/c/Users/circleci/build/libevent" ]]; then
echo "libevent already compiled, skipping"
exit 0
fi
gpg --list-keys
curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9e3ac83a27974b84d1b3401db86086848ef8686d" | gpg --import
curl https://keys.openpgp.org/vks/v1/by-fingerprint/B74417EDDF22AC9F9E90F49142E86A2A11F48D36 | gpg --import
gpg --list-keys
# Build libevent # Build libevent
- run: - run:
name: Build libevent name: Build libevent
@ -155,6 +140,7 @@ jobs:
mkdir -p /cygdrive/c/Users/circleci/build mkdir -p /cygdrive/c/Users/circleci/build
# Get source # Get source
curl "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9e3ac83a27974b84d1b3401db86086848ef8686d" | gpg --import
cd /cygdrive/c/Users/circleci/src cd /cygdrive/c/Users/circleci/src
git clone https://github.com/libevent/libevent.git git clone https://github.com/libevent/libevent.git
cd libevent cd libevent
@ -182,7 +168,7 @@ jobs:
# name: Build tor # name: Build tor
# command: | # command: |
# # tor signing key # # tor signing key
# curl https://keys.openpgp.org/vks/v1/by-fingerprint/B74417EDDF22AC9F9E90F49142E86A2A11F48D36 | gpg --import
# $LibeventTag = "release-2.1.12-stable" # $LibeventTag = "release-2.1.12-stable"
# $TorTag = "tor-0.4.7.7" # $TorTag = "tor-0.4.7.7"