diff options
| author | Micah Lee <micah@micahflee.com> | 2022-06-05 15:14:41 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2022-06-05 15:14:41 -0700 |
| commit | 4fce717cdb4f7f2af4c074883fc586681123ef50 (patch) | |
| tree | 1ba115511d944d82be881d763e4d31b54c594c35 | |
| parent | 5e71c90828a9dfe7bbc4dc3d7bef629fe190fc7b (diff) | |
| download | onionshare-4fce717cdb4f7f2af4c074883fc586681123ef50.tar.gz onionshare-4fce717cdb4f7f2af4c074883fc586681123ef50.zip | |
Try building in Debian instead of Ubuntu
| -rw-r--r-- | .circleci/config.yml | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 26882fb0..018ceadd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,8 +88,8 @@ jobs: # Based off of https://github.com/ahf/tor-win32 build-tor-windows: docker: - - image: cimg/python:3.9 - resource_class: large + - image: debian/bullseye + resource_class: medium+ environment: # NOTE: change when upgrading openssl OPENSSL_VERSION: "3.0.3" @@ -101,10 +101,8 @@ jobs: - run: name: Install build dependencies command: | - sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe" >> /etc/apt/sources.list' - sudo apt-get update - sudo apt-get install -t jammy -y build-essential autoconf automake libtool - sudo apt-get install -t jammy -y gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 libz-mingw-w64-dev + apt-get update + apt-get install -t jammy -y build-essential autoconf automake libtool gcc-mingw-w64-i686 gcc-mingw-w64-x86-64 libz-mingw-w64-dev - run: name: Create folders @@ -339,8 +337,8 @@ jobs: --with-openssl-dir=/home/circleci/build/prefix-openssl-x32 \ --disable-tool-name-check \ --enable-fatal-warnings \ - --prefix=/home/circleci/build/prefix-tor-x32 - make -j$(nproc) + --prefix=/home/circleci/build/prefix-tor-x32 && \ + make -j$(nproc) && \ make install - save_cache: # NOTE: change when upgrading tor @@ -376,8 +374,8 @@ jobs: --with-openssl-dir=/home/circleci/build/prefix-openssl-x64 \ --disable-tool-name-check \ --enable-fatal-warnings \ - --prefix=/home/circleci/build/prefix-tor-x64 - make -j$(nproc) + --prefix=/home/circleci/build/prefix-tor-x64 && \ + make -j$(nproc) && \ make install - save_cache: # NOTE: change when upgrading tor |