From 2e5eff745bf212b56eb076ab63e21187278331fc Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 10:00:24 -0400 Subject: [PATCH 1/8] fix: try fix publish bb --- .github/workflows/publish-bb.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index a8494fcaa432..1288a130c7d3 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -21,7 +21,7 @@ permissions: jobs: build-x86_64-linux-gnu: name: Build on Linux GNU - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout Code uses: actions/checkout@v3 @@ -40,12 +40,10 @@ jobs: - name: Install Clang16 run: | - wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz - tar -xvf clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz - sudo cp clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/bin/* /usr/local/bin/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/include/* /usr/local/include/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/lib/* /usr/local/lib/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/share/* /usr/local/share/ + apt install lsb-release wget software-properties-common gnupg + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + ./llvm.sh 16 - name: Compile Barretenberg run: | @@ -67,7 +65,7 @@ jobs: build-wasm-ts: name: Build WASM and deploy to TS - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout Code uses: actions/checkout@v3 @@ -86,12 +84,10 @@ jobs: - name: Install Clang16 run: | - wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.4/clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz - tar -xvf clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04.tar.xz - sudo cp clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/bin/* /usr/local/bin/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/include/* /usr/local/include/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/lib/* /usr/local/lib/ - sudo cp -r clang+llvm-16.0.4-x86_64-linux-gnu-ubuntu-22.04/share/* /usr/local/share/ + apt install lsb-release wget software-properties-common gnupg + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + ./llvm.sh 16 - name: Install yarn run: | From 5c7d6b8437f0e3dad69f7b8140ac7648434b380a Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 10:03:26 -0400 Subject: [PATCH 2/8] Update publish-bb.yml --- .github/workflows/publish-bb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 1288a130c7d3..df5627420586 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -40,10 +40,10 @@ jobs: - name: Install Clang16 run: | - apt install lsb-release wget software-properties-common gnupg + sudo apt install lsb-release wget software-properties-common gnupg wget https://apt.llvm.org/llvm.sh chmod +x llvm.sh - ./llvm.sh 16 + sudo ./llvm.sh 16 - name: Compile Barretenberg run: | From 8eaaaa92ef9d432b2d687e155d6d7d5583bc90a3 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 15:02:12 +0000 Subject: [PATCH 3/8] try use clang std --- .github/workflows/publish-bb.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index df5627420586..85c074131764 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -40,16 +40,18 @@ jobs: - name: Install Clang16 run: | - sudo apt install lsb-release wget software-properties-common gnupg - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - sudo ./llvm.sh 16 + wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz + tar -xvf clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz + sudo cp clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/* /usr/local/bin/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/include/* /usr/local/include/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/* /usr/local/lib/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/share/* /usr/local/share/ - name: Compile Barretenberg run: | cd barretenberg/cpp - cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere + cmake --preset default -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere cmake --build --preset default --target bb - name: Tar and GZip bb Binary (Ubuntu) @@ -84,10 +86,12 @@ jobs: - name: Install Clang16 run: | - apt install lsb-release wget software-properties-common gnupg - wget https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - ./llvm.sh 16 + wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz + tar -xvf clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz + sudo cp clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/* /usr/local/bin/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/include/* /usr/local/include/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/* /usr/local/lib/ + sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/share/* /usr/local/share/ - name: Install yarn run: | From b7741067992dcc0534a89020abb41c511165edc9 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 15:13:24 +0000 Subject: [PATCH 4/8] try use clang std from cmakelists --- .github/workflows/publish-bb.yml | 2 +- barretenberg/cpp/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 85c074131764..00fa792ba6a1 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -51,7 +51,7 @@ jobs: run: | cd barretenberg/cpp - cmake --preset default -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere + cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere cmake --build --preset default --target bb - name: Tar and GZip bb Binary (Ubuntu) diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt index 57d1f4b733a9..6b8e52f9f571 100644 --- a/barretenberg/cpp/CMakeLists.txt +++ b/barretenberg/cpp/CMakeLists.txt @@ -86,6 +86,8 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS ON) +# Use clang stdlib +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14") message(WARNING "Clang <14 is not supported") From 95518cc31eac5726b0e4ab8212bd7d90a8545e9f Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 16:31:59 +0000 Subject: [PATCH 5/8] Revert --- .github/workflows/publish-bb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 00fa792ba6a1..85c074131764 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -51,7 +51,7 @@ jobs: run: | cd barretenberg/cpp - cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere + cmake --preset default -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere cmake --build --preset default --target bb - name: Tar and GZip bb Binary (Ubuntu) From 19608b8e2b068ee348b3fd34a349269cf304d84e Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 16:45:05 +0000 Subject: [PATCH 6/8] Revert --- barretenberg/cpp/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt index 6b8e52f9f571..57d1f4b733a9 100644 --- a/barretenberg/cpp/CMakeLists.txt +++ b/barretenberg/cpp/CMakeLists.txt @@ -86,8 +86,6 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS ON) -# Use clang stdlib -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14") message(WARNING "Clang <14 is not supported") From 46c77d4bb20245cfb0991196a3aebe45bcf5242a Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 13:04:33 -0400 Subject: [PATCH 7/8] fix: bump to 64 cores --- .github/workflows/publish-bb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 85c074131764..4cbf948384a0 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -21,7 +21,7 @@ permissions: jobs: build-x86_64-linux-gnu: name: Build on Linux GNU - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04-64core steps: - name: Checkout Code uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: build-wasm-ts: name: Build WASM and deploy to TS - runs-on: ubuntu-20.04 + runs-on: ubuntu-20.04-64core steps: - name: Checkout Code uses: actions/checkout@v3 From db6af14de972d754a705e74b799ba78359aa9298 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 25 Oct 2023 13:22:49 -0400 Subject: [PATCH 8/8] Update publish-bb.yml --- .github/workflows/publish-bb.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml index 4cbf948384a0..85c074131764 100644 --- a/.github/workflows/publish-bb.yml +++ b/.github/workflows/publish-bb.yml @@ -21,7 +21,7 @@ permissions: jobs: build-x86_64-linux-gnu: name: Build on Linux GNU - runs-on: ubuntu-20.04-64core + runs-on: ubuntu-20.04 steps: - name: Checkout Code uses: actions/checkout@v3 @@ -67,7 +67,7 @@ jobs: build-wasm-ts: name: Build WASM and deploy to TS - runs-on: ubuntu-20.04-64core + runs-on: ubuntu-20.04 steps: - name: Checkout Code uses: actions/checkout@v3