From 1f65347e72063319d0e89f429b19e72947736b34 Mon Sep 17 00:00:00 2001 From: Charlie Lye Date: Mon, 4 Sep 2023 09:37:21 +0000 Subject: [PATCH] Mac/Linux base64 can be unified. --- .circleci/config.yml | 1 + .../barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 700f39f1f37..fc5c8ddadd8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1239,6 +1239,7 @@ circuits-x86_64-test: &circuits-x86_64-test requires: - circuits-x86_64-linux-clang-assert <<: *defaults + workflows: system: when: diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp index 755dca2a118..2b59e9b4f5e 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp @@ -6,12 +6,6 @@ */ inline std::vector get_bytecode(const std::string& bytecodePath) { -// base64 on mac is different from linux -#ifdef __APPLE__ - std::string command = "base64 -D -i " + bytecodePath + " | gunzip"; -#else - std::string command = "base64 -d " + bytecodePath + " | gunzip"; -#endif - + std::string command = "cat " + bytecodePath + " | base64 -d | gunzip"; return exec_pipe(command); } \ No newline at end of file