Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 15:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Switch to bash

Browse Source
This commit is contained in:
Micah Lee 2022-05-26 20:20:37 -07:00
parent 1b67e6a6fd
commit cc0ab0ef79
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
.circleci/config.yml
View File

@ -85,7 +85,7 @@ jobs:
build-win64: build-win64:
executor: executor:
name: win/default name: win/default
shell: powershell.exe shell: bash.exe
environment: environment:
OPENSSL_TAG: "openssl-3.0.3" OPENSSL_TAG: "openssl-3.0.3"
LIBEVENT_TAG: "release-2.1.12-stable" LIBEVENT_TAG: "release-2.1.12-stable"
@ -121,9 +121,9 @@ jobs:
command: | command: |
choco install msys2 --params "/NoUpdate /InstallDir:C:\msys2" choco install msys2 --params "/NoUpdate /InstallDir:C:\msys2"
refreshenv refreshenv
C:\msys2\usr\bin\bash -c "/c/msys2/usr/bin/pacman -S --needed --noconfirm autoconf automake libtool make clang perl-Pod-Parser" /c/msys2/usr/bin/pacman -S --needed --noconfirm autoconf automake libtool make clang perl-Pod-Parser
mkdir C:\Users\circleci\src mkdir /c/Users/circleci/src
mkdir C:\Users\circleci\build mkdir /c/Users/circleci/build
# Build openssl # Build openssl
- restore_cache: - restore_cache:
@ -131,72 +131,69 @@ jobs:
- run: - run:
name: Build openssl name: Build openssl
command: | command: |
if (Test-Path -Path "C:\Users\circleci\build\openssl") { export PATH=/c/msys2/usr/bin:/c/msys2/usr/bin/core_perl:$PATH
Write-Output "openssl already compiled, skipping" if [[ -d "/c/Users/circleci/build/openssl" ]]; then
} else { echo "openssl already compiled, skipping"
elif
# Get source # Get source
gpg --recv-key 8657ABB260F056B1E5190839D9C4D26D0E604491 gpg --recv-key 8657ABB260F056B1E5190839D9C4D26D0E604491
cd C:\Users\circleci\src cd /c/Users/circleci/src
git clone https://github.com/openssl/openssl.git git clone https://github.com/openssl/openssl.git
cd openssl cd openssl
git tag -v $OPENSSL_TAG git tag -v $OPENSSL_TAG
if($? -ne $true) { throw "openssl tag doesn't verify" } if [ $? -eq 0 ]; then
echo "openssl tag doesn't verify"
exit -1
fi
git checkout $OPENSSL_TAG git checkout $OPENSSL_TAG
# Build # Build
$BuildScript = {
#!/bin/bash
export PATH=/c/msys2/usr/bin:/c/msys2/usr/bin/core_perl:$PATH
cd /c/Users/circleci/src/openssl
./Configure --prefix=/opt/openssl-build --openssldir=/usr/local/ssl '-Wl,-rpath,$(LIBRPATH)' Cygwin-x86_64 ./Configure --prefix=/opt/openssl-build --openssldir=/usr/local/ssl '-Wl,-rpath,$(LIBRPATH)' Cygwin-x86_64
make -j$(nproc) make -j$(nproc)
make install make install
cp -r /opt/openssl-build /c/Users/circleci/build/openssl cp -r /opt/openssl-build /c/Users/circleci/build/openssl
} fi
Set-Content -Path C:\Users\circleci\src\build-openssl.sh -Value $BuildScript.ToString()
C:\msys2\usr\bin\bash -c "/c/Users/circleci/src/build-openssl.sh"
}
- save_cache: - save_cache:
key: "build-win64-openssl-{{ .Environment.OPENSSL_TAG }}" key: "build-win64-openssl-{{ .Environment.OPENSSL_TAG }}"
paths: paths:
- C:\Users\circleci\build\openssl - C:\Users\circleci\build\openssl
# Build libevent # # Build libevent
- restore_cache: # - restore_cache:
key: "build-win64-livevent-{{ .Environment.LIBEVENT_TAG }}" # key: "build-win64-livevent-{{ .Environment.LIBEVENT_TAG }}"
- run: # - run:
name: Build libevent # name: Build libevent
command: | # command: |
if (Test-Path -Path "C:\Users\circleci\build\openssl") { # if (Test-Path -Path "C:\Users\circleci\build\openssl") {
Write-Output "openssl already compiled, skipping" # Write-Output "openssl already compiled, skipping"
} else { # } else {
# Get source # # Get source
gpg --recv-key 9E3AC83A27974B84D1B3401DB86086848EF8686D # gpg --recv-key 9E3AC83A27974B84D1B3401DB86086848EF8686D
cd C:\Users\circleci\src # cd C:\Users\circleci\src
git clone https://github.com/libevent/libevent.git # git clone https://github.com/libevent/libevent.git
cd libevent # cd libevent
git tag -v $LIBEVENT_TAG # git tag -v $LIBEVENT_TAG
if($? -ne $true) { throw "libevent tag doesn't verify" } # if($? -ne $true) { throw "libevent tag doesn't verify" }
git checkout $LIBEVENT_TAG # git checkout $LIBEVENT_TAG
# Build # # Build
$BuildScript = { # $BuildScript = {
#!/bin/bash # #!/bin/bash
export PATH=/c/msys2/usr/bin:$PATH # export PATH=/c/msys2/usr/bin:$PATH
cd /c/Users/circleci/src/libevent # cd /c/Users/circleci/src/libevent
./autogen.sh # ./autogen.sh
./configure --prefix=/opt/libevent-build --with-pic # ./configure --prefix=/opt/libevent-build --with-pic
make -j$(nproc) # make -j$(nproc)
make install # make install
cp -r /opt/libevent-build /c/Users/circleci/build/libevent # cp -r /opt/libevent-build /c/Users/circleci/build/libevent
} # }
Set-Content -Path C:\Users\circleci\src\build-libevent.sh -Value $BuildScript.ToString() # Set-Content -Path C:\Users\circleci\src\build-libevent.sh -Value $BuildScript.ToString()
C:\msys2\usr\bin\bash -c "/c/Users/circleci/src/build-libevent.sh" # C:\msys2\usr\bin\bash -c "/c/Users/circleci/src/build-libevent.sh"
} # }
- save_cache: # - save_cache:
key: "build-win64-libevent-{{ .Environment.LIBEVENT_TAG }}" # key: "build-win64-libevent-{{ .Environment.LIBEVENT_TAG }}"
paths: # paths:
- C:\Users\circleci\build\libevent # - C:\Users\circleci\build\libevent
# # Build tor # # Build tor
# - run: # - run: