From 50370cc74bf87917404ec19ced4c7b52096fee0f Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 12:41:11 -0400 Subject: [PATCH 01/17] Add .circleci/config.yml --- .circleci/config.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..6554e1f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,26 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +version: 2.1 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/2.0/configuration-reference/#jobs +jobs: + say-hello: + # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. + # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + docker: + - image: cimg/base:stable + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + - checkout + - run: + name: "Say hello" + command: "echo Hello, World!" + +# Invoke jobs via workflows +# See: https://circleci.com/docs/2.0/configuration-reference/#workflows +workflows: + say-hello-workflow: + jobs: + - say-hello From 41d27ad35791cdeece7615678040e7ad8e47a599 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:31:34 -0400 Subject: [PATCH 02/17] Trying GPT-4 auto conversion from travis-ci yml --- .circleci/config.yml | 47 +++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6554e1f..ab344fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,26 +1,33 @@ -# Use the latest 2.1 version of CircleCI pipeline process engine. -# See: https://circleci.com/docs/2.0/configuration-reference version: 2.1 - -# Define a job to be invoked later in a workflow. -# See: https://circleci.com/docs/2.0/configuration-reference/#jobs jobs: - say-hello: - # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub. - # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor + build: docker: - - image: cimg/base:stable - # Add steps to the job - # See: https://circleci.com/docs/2.0/configuration-reference/#steps + - image: circleci/buildpack-deps:trusty + environment: + - CACHE_DIR: ~/build/wxWidgets/staticlib steps: - checkout + - restore_cache: + keys: + - cache-{{ checksum "circleci/cache-key" }} - run: - name: "Say hello" - command: "echo Hello, World!" - -# Invoke jobs via workflows -# See: https://circleci.com/docs/2.0/configuration-reference/#workflows -workflows: - say-hello-workflow: - jobs: - - say-hello + name: Install Dependencies + command: | + sudo apt-get update + sudo apt-get install -y libpulse-dev libgtk-3-dev freeglut3 freeglut3-dev libhamlib-dev + - run: + name: Build LiquidDSP + command: bash travis-ci/build_liquiddsp.sh + - run: + name: Build SoapySDR + command: bash travis-ci/build_soapysdr.sh + - run: + name: Build wxWidgets + command: bash travis-ci/build_wxwidgets.sh + - run: + name: Build CubicSDR + command: bash travis-ci/build_cubicsdr.sh + - save_cache: + key: cache-{{ checksum "circleci/cache-key" }} + paths: + - ~/build/wxWidgets/staticlib From f59e25a4bf8e7fb7942b7eebcfe3c0e0da0ca249 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:38:22 -0400 Subject: [PATCH 03/17] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab344fd..4a2ca2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,14 +2,14 @@ version: 2.1 jobs: build: docker: - - image: circleci/buildpack-deps:trusty + - image: circleci/ubuntu-server:22.04 environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: - checkout - restore_cache: keys: - - cache-{{ checksum "circleci/cache-key" }} + - cache-{{ checksum "travis-ci/build_wxwidgets.sh" }} - run: name: Install Dependencies command: | @@ -28,6 +28,6 @@ jobs: name: Build CubicSDR command: bash travis-ci/build_cubicsdr.sh - save_cache: - key: cache-{{ checksum "circleci/cache-key" }} + key: cache-{{ checksum "travis-ci/build_wxwidgets.sh" }} paths: - ~/build/wxWidgets/staticlib From eba9a18182e502c45f8dfbffde8c27ea684f1761 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:39:55 -0400 Subject: [PATCH 04/17] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a2ca2e..e0c45d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: build: docker: - - image: circleci/ubuntu-server:22.04 + - image: ubuntu-2204 environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: From be641f1946e9f89595f6e84526374705cb13fa67 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:42:00 -0400 Subject: [PATCH 05/17] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e0c45d5..0151bd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: build: docker: - - image: ubuntu-2204 + - image: cimg/base:2020.01 environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: From f4aacd11e204c8193c260011f1813e364beca88f Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:43:56 -0400 Subject: [PATCH 06/17] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0151bd2..f4caefc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: name: Install Dependencies command: | sudo apt-get update - sudo apt-get install -y libpulse-dev libgtk-3-dev freeglut3 freeglut3-dev libhamlib-dev + sudo apt-get install -y build-essential cmake libpulse-dev libgtk-3-dev freeglut3 freeglut3-dev libhamlib-dev - run: name: Build LiquidDSP command: bash travis-ci/build_liquiddsp.sh From 2dff8948e36ac9b75a94b89804e1be2e40c75838 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 21:46:34 -0400 Subject: [PATCH 07/17] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f4caefc..365af37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,15 +15,15 @@ jobs: command: | sudo apt-get update sudo apt-get install -y build-essential cmake libpulse-dev libgtk-3-dev freeglut3 freeglut3-dev libhamlib-dev + - run: + name: Build wxWidgets + command: bash travis-ci/build_wxwidgets.sh - run: name: Build LiquidDSP command: bash travis-ci/build_liquiddsp.sh - run: name: Build SoapySDR command: bash travis-ci/build_soapysdr.sh - - run: - name: Build wxWidgets - command: bash travis-ci/build_wxwidgets.sh - run: name: Build CubicSDR command: bash travis-ci/build_cubicsdr.sh From 0b899dbdb3a734450e67dd5fc6a76b35dfed96b3 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 22:24:29 -0400 Subject: [PATCH 08/17] Move scripts to circle-ci Minor updates to build scripts --- .circleci/config.yml | 14 +++++++------- .circleci/scripts/build_cubicsdr.sh | 5 +++++ .../scripts}/build_liquiddsp.sh | 12 +++++------- .circleci/scripts/build_soapysdr.sh | 13 +++++++++++++ .../scripts}/build_wxwidgets.sh | 10 ++++------ travis-ci/build_cubicsdr.sh | 7 ------- travis-ci/build_soapysdr.sh | 16 ---------------- 7 files changed, 34 insertions(+), 43 deletions(-) create mode 100644 .circleci/scripts/build_cubicsdr.sh rename {travis-ci => .circleci/scripts}/build_liquiddsp.sh (55%) create mode 100644 .circleci/scripts/build_soapysdr.sh rename {travis-ci => .circleci/scripts}/build_wxwidgets.sh (90%) delete mode 100644 travis-ci/build_cubicsdr.sh delete mode 100644 travis-ci/build_soapysdr.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 365af37..9dbca3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 jobs: - build: + build_linux: docker: - image: cimg/base:2020.01 environment: @@ -9,7 +9,7 @@ jobs: - checkout - restore_cache: keys: - - cache-{{ checksum "travis-ci/build_wxwidgets.sh" }} + - cache-{{ checksum ".circleci/scripts/build_wxwidgets.sh" }} - run: name: Install Dependencies command: | @@ -17,17 +17,17 @@ jobs: sudo apt-get install -y build-essential cmake libpulse-dev libgtk-3-dev freeglut3 freeglut3-dev libhamlib-dev - run: name: Build wxWidgets - command: bash travis-ci/build_wxwidgets.sh + command: bash .circleci/scripts/build_wxwidgets.sh - run: name: Build LiquidDSP - command: bash travis-ci/build_liquiddsp.sh + command: bash .circleci/scripts/build_liquiddsp.sh - run: name: Build SoapySDR - command: bash travis-ci/build_soapysdr.sh + command: bash .circleci/scripts/build_soapysdr.sh - run: name: Build CubicSDR - command: bash travis-ci/build_cubicsdr.sh + command: bash .circleci/scripts/build_cubicsdr.sh - save_cache: - key: cache-{{ checksum "travis-ci/build_wxwidgets.sh" }} + key: cache-{{ checksum ".circleci/scripts/build_wxwidgets.sh" }} paths: - ~/build/wxWidgets/staticlib diff --git a/.circleci/scripts/build_cubicsdr.sh b/.circleci/scripts/build_cubicsdr.sh new file mode 100644 index 0000000..138a470 --- /dev/null +++ b/.circleci/scripts/build_cubicsdr.sh @@ -0,0 +1,5 @@ +# CubicSDR +mkdir -p $HOME/build/cjcliffe/CubicSDR-build +cd $HOME/build/cjcliffe/CubicSDR-build +cmake ~/project -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config -DUSE_HAMLIB=1 -DENABLE_DIGITAL_LAB=1 +make -j$(nproc) diff --git a/travis-ci/build_liquiddsp.sh b/.circleci/scripts/build_liquiddsp.sh similarity index 55% rename from travis-ci/build_liquiddsp.sh rename to .circleci/scripts/build_liquiddsp.sh index 12d9ef2..470ccd8 100644 --- a/travis-ci/build_liquiddsp.sh +++ b/.circleci/scripts/build_liquiddsp.sh @@ -1,16 +1,14 @@ # Liquid-DSP -cd $HOME/build - -mkdir jgaeddert/ -cd jgaeddert/ +mkdir -p $HOME/build/jgaeddert +cd $HOME/build/jgaeddert git clone https://github.com/jgaeddert/liquid-dsp.git -cd liquid-dsp/ +cd $HOME/build/jgaeddert/liquid-dsp ./bootstrap.sh echo "Configuring liquid-dsp.." ./configure > /dev/null echo "Building liquid-dsp.." -make -j2 > /dev/null -sudo make install \ No newline at end of file +make -j$(nproc) > /dev/null +sudo make install diff --git a/.circleci/scripts/build_soapysdr.sh b/.circleci/scripts/build_soapysdr.sh new file mode 100644 index 0000000..1901337 --- /dev/null +++ b/.circleci/scripts/build_soapysdr.sh @@ -0,0 +1,13 @@ +# Soapy SDR +mkdir -p $HOME/build/pothosware/SoapySDR-build + +cd $HOME/build/pothosware +git clone https://github.com/pothosware/SoapySDR.git + +cd $HOME/build/pothosware/SoapySDR-build +cmake $HOME/build/pothosware/SoapySDR -DCMAKE_BUILD_TYPE=Release + +echo "Building SoapySDR.." +make -j$(nproc) > /dev/null + +sudo make install diff --git a/travis-ci/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh similarity index 90% rename from travis-ci/build_wxwidgets.sh rename to .circleci/scripts/build_wxwidgets.sh index aa5b065..0c6a74c 100644 --- a/travis-ci/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -8,9 +8,8 @@ fi echo "Fetch wxWidgets.." -cd $HOME/build mkdir -p $HOME/build/wxWidgets/staticlib -cd wxWidgets +cd $HOME/build/wxWidgets wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.1/wxWidgets-3.2.1.tar.bz2 > /dev/null echo "Unpacking wxWidgets.." @@ -18,15 +17,14 @@ tar -xvjf wxWidgets-3.2.1.tar.bz2 > /dev/null cd wxWidgets-3.2.1/ ./autogen.sh -if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then +if [[ "$CIRCLE_JOB" == "build_linux" ]]; then ./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" fi -if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then +if [[ "$CIRCLE_JOB" == "build_mac" ]]; then ./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr fi echo "Building wxWidgets.." -make -j2 +make -j$(nproc) make install - diff --git a/travis-ci/build_cubicsdr.sh b/travis-ci/build_cubicsdr.sh deleted file mode 100644 index bbdbc2d..0000000 --- a/travis-ci/build_cubicsdr.sh +++ /dev/null @@ -1,7 +0,0 @@ -# CubicSDR -cd $HOME/build -mkdir cjcliffe/CubicSDR-build -cd cjcliffe/CubicSDR-build -cmake ../CubicSDR -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config -DUSE_HAMLIB=1 -DENABLE_DIGITAL_LAB=1 -make -j2 - diff --git a/travis-ci/build_soapysdr.sh b/travis-ci/build_soapysdr.sh deleted file mode 100644 index 0f8b8a1..0000000 --- a/travis-ci/build_soapysdr.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Soapy SDR -cd $HOME/build - -mkdir pothosware/ -cd pothosware/ -git clone https://github.com/pothosware/SoapySDR.git - -mkdir SoapySDR-build -cd SoapySDR-build - -cmake ../SoapySDR -DCMAKE_BUILD_TYPE=Release - -echo "Building SoapySDR.." -make -j2 > /dev/null - -sudo make install \ No newline at end of file From 437a66b3bd7992a7069dd58ee0f9bc0f5bf78789 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 22:27:45 -0400 Subject: [PATCH 09/17] job name not configurable? --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9dbca3b..5f58bf9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 jobs: - build_linux: + build: docker: - image: cimg/base:2020.01 environment: From 8ad45faec5d2b5a5f1bf27d753c6e2d9d2cc2192 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 22:30:57 -0400 Subject: [PATCH 10/17] Just check build env using uname --- .circleci/scripts/build_wxwidgets.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/scripts/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh index 0c6a74c..0013041 100644 --- a/.circleci/scripts/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -17,11 +17,10 @@ tar -xvjf wxWidgets-3.2.1.tar.bz2 > /dev/null cd wxWidgets-3.2.1/ ./autogen.sh -if [[ "$CIRCLE_JOB" == "build_linux" ]]; then -./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" -fi -if [[ "$CIRCLE_JOB" == "build_mac" ]]; then +if [ "$(uname)" == "Linux" ]; then +./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" +elif [ "$(uname)" == "Darwin" ]; then ./configure --with-opengl --disable-glcanvasegl --disable-shared --enable-monolithic --with-libjpeg --with-libtiff --with-libpng --with-zlib --with-mac --disable-sdltest --enable-unicode --enable-display --enable-propgrid --disable-webkit --disable-webview --disable-webviewwebkit --prefix=`echo $HOME/build/wxWidgets/staticlib` CXXFLAGS="-std=c++0x" --with-libiconv=/usr fi From 61797c2ac618ef366bdb39ec28d2e54961b1ba37 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 23:04:03 -0400 Subject: [PATCH 11/17] Build wx verbose (output timeout) Disable other build steps for the moment; see if we can get a working wxwidgets cache first --- .circleci/config.yml | 18 +++++++++--------- .circleci/scripts/build_wxwidgets.sh | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f58bf9..1c62028 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,15 +18,15 @@ jobs: - run: name: Build wxWidgets command: bash .circleci/scripts/build_wxwidgets.sh - - run: - name: Build LiquidDSP - command: bash .circleci/scripts/build_liquiddsp.sh - - run: - name: Build SoapySDR - command: bash .circleci/scripts/build_soapysdr.sh - - run: - name: Build CubicSDR - command: bash .circleci/scripts/build_cubicsdr.sh + # - run: + # name: Build LiquidDSP + # command: bash .circleci/scripts/build_liquiddsp.sh + # - run: + # name: Build SoapySDR + # command: bash .circleci/scripts/build_soapysdr.sh + # - run: + # name: Build CubicSDR + # command: bash .circleci/scripts/build_cubicsdr.sh - save_cache: key: cache-{{ checksum ".circleci/scripts/build_wxwidgets.sh" }} paths: diff --git a/.circleci/scripts/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh index 0013041..e3fad14 100644 --- a/.circleci/scripts/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -25,5 +25,5 @@ elif [ "$(uname)" == "Darwin" ]; then fi echo "Building wxWidgets.." -make -j$(nproc) +make V=1 -j$(nproc) make install From 1fd2f431cb6168d6d4b03bb97d93266f782b8a8a Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 23:23:36 -0400 Subject: [PATCH 12/17] Update config.yml Try newer base image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c62028..52cb571 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/base:2020.01 + - image: cimg/base:current-22.04 environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: From c0e71c70d6e4f5c708c86732922a01805c5bb5e8 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 23:40:45 -0400 Subject: [PATCH 13/17] Update config.yml wx cached; try remaining build steps --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 52cb571..734283e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,15 +18,15 @@ jobs: - run: name: Build wxWidgets command: bash .circleci/scripts/build_wxwidgets.sh - # - run: - # name: Build LiquidDSP - # command: bash .circleci/scripts/build_liquiddsp.sh - # - run: - # name: Build SoapySDR - # command: bash .circleci/scripts/build_soapysdr.sh - # - run: - # name: Build CubicSDR - # command: bash .circleci/scripts/build_cubicsdr.sh + - run: + name: Build LiquidDSP + command: bash .circleci/scripts/build_liquiddsp.sh + - run: + name: Build SoapySDR + command: bash .circleci/scripts/build_soapysdr.sh + - run: + name: Build CubicSDR + command: bash .circleci/scripts/build_cubicsdr.sh - save_cache: key: cache-{{ checksum ".circleci/scripts/build_wxwidgets.sh" }} paths: From b4fee0dff7d2538a6af76d13dfbc9da038decbb3 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 23:52:33 -0400 Subject: [PATCH 14/17] Update config.yml needs a bit more memory to build I think; boost resource_class --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 734283e..21f45f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,7 @@ jobs: build: docker: - image: cimg/base:current-22.04 + resource_class: medium+ environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: From b3428c3ba812610dfc7a31b03810224814ff6083 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 28 Mar 2023 23:55:46 -0400 Subject: [PATCH 15/17] Update config.yml boost resource_class once more --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 21f45f1..c0c513d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: - image: cimg/base:current-22.04 - resource_class: medium+ + resource_class: large environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: From 165ace2c37e796c964efe8b573ebba7ad3789db0 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 29 Mar 2023 00:10:20 -0400 Subject: [PATCH 16/17] Don't use nproc on CI; it returns host threads --- .circleci/config.yml | 2 +- .circleci/scripts/build_cubicsdr.sh | 2 +- .circleci/scripts/build_liquiddsp.sh | 2 +- .circleci/scripts/build_soapysdr.sh | 2 +- .circleci/scripts/build_wxwidgets.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0c513d..5af5c49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: docker: - image: cimg/base:current-22.04 - resource_class: large + resource_class: medium environment: - CACHE_DIR: ~/build/wxWidgets/staticlib steps: diff --git a/.circleci/scripts/build_cubicsdr.sh b/.circleci/scripts/build_cubicsdr.sh index 138a470..8c724ac 100644 --- a/.circleci/scripts/build_cubicsdr.sh +++ b/.circleci/scripts/build_cubicsdr.sh @@ -2,4 +2,4 @@ mkdir -p $HOME/build/cjcliffe/CubicSDR-build cd $HOME/build/cjcliffe/CubicSDR-build cmake ~/project -DCMAKE_BUILD_TYPE=Release -DwxWidgets_CONFIG_EXECUTABLE=$HOME/build/wxWidgets/staticlib/bin/wx-config -DUSE_HAMLIB=1 -DENABLE_DIGITAL_LAB=1 -make -j$(nproc) +make -j2 diff --git a/.circleci/scripts/build_liquiddsp.sh b/.circleci/scripts/build_liquiddsp.sh index 470ccd8..07cbe26 100644 --- a/.circleci/scripts/build_liquiddsp.sh +++ b/.circleci/scripts/build_liquiddsp.sh @@ -10,5 +10,5 @@ echo "Configuring liquid-dsp.." ./configure > /dev/null echo "Building liquid-dsp.." -make -j$(nproc) > /dev/null +make -j2 > /dev/null sudo make install diff --git a/.circleci/scripts/build_soapysdr.sh b/.circleci/scripts/build_soapysdr.sh index 1901337..3cc8d82 100644 --- a/.circleci/scripts/build_soapysdr.sh +++ b/.circleci/scripts/build_soapysdr.sh @@ -8,6 +8,6 @@ cd $HOME/build/pothosware/SoapySDR-build cmake $HOME/build/pothosware/SoapySDR -DCMAKE_BUILD_TYPE=Release echo "Building SoapySDR.." -make -j$(nproc) > /dev/null +make -j2 > /dev/null sudo make install diff --git a/.circleci/scripts/build_wxwidgets.sh b/.circleci/scripts/build_wxwidgets.sh index e3fad14..c4ef42f 100644 --- a/.circleci/scripts/build_wxwidgets.sh +++ b/.circleci/scripts/build_wxwidgets.sh @@ -25,5 +25,5 @@ elif [ "$(uname)" == "Darwin" ]; then fi echo "Building wxWidgets.." -make V=1 -j$(nproc) +make V=1 -j2 make install From e1e30ed890eed87aea152bae82faffe982938fe4 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Wed, 29 Mar 2023 00:29:59 -0400 Subject: [PATCH 17/17] Delete .travis.yml --- .travis.yml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c16ef30..0000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -os: - - linux - - osx -osx_image: xcode11.3 -dist: trusty -language: cpp -addons: - apt: - packages: - - libpulse-dev - - libgtk-3-dev - - freeglut3 - - freeglut3-dev - - libhamlib-dev -script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install hamlib; fi - - bash travis-ci/build_liquiddsp.sh - - bash travis-ci/build_soapysdr.sh - - bash travis-ci/build_wxwidgets.sh - - bash travis-ci/build_cubicsdr.sh -cache: - directories: - - $HOME/build/wxWidgets/staticlib