From ff1279bec4831f29a56ee5442caca72e4a188a2e Mon Sep 17 00:00:00 2001 From: xxchan Date: Tue, 19 Sep 2023 08:35:21 +0800 Subject: [PATCH 01/24] bump --- Formula/risingwave.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index dbc841f..fd980fb 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -1,18 +1,12 @@ class Risingwave < Formula - RW_VERSION = "1.1.2".freeze + RW_VERSION = "1.2.0".freeze desc "Distributed SQL database for stream processing" homepage "https://github.com/risingwavelabs/risingwave" url "https://github.com/risingwavelabs/risingwave/archive/refs/tags/v#{RW_VERSION}.tar.gz" - sha256 "9f137bded84d3fe7713c4bc37674c40f6a7f1c73ef68df55a6e71f1656af5231" + sha256 "8dc4e3997941a31b3ff08ac0be760cbdcb840b8e40dcc99b40c2eafe346e034c" license "Apache-2.0" head "https://github.com/risingwavelabs/risingwave.git", branch: "main" - bottle do - root_url "https://github.com/risingwavelabs/homebrew-risingwave/releases/download/risingwave-1.1.2" - sha256 cellar: :any, arm64_monterey: "bc4e9742da58038881a106b2f4000f94d5ca94da96451d1b68d386f60c028894" - sha256 cellar: :any, monterey: "a23810510625b3c83fb61de6645e6b2d15c567ce1c5914ca6a872cd46aab83bc" - end - depends_on "cmake" => :build depends_on "llvm" => :build depends_on "protobuf" => :build From fc0d9d33e44bb4e288252f70c9dc015881704099 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 10:06:25 +0800 Subject: [PATCH 02/24] uses the M1 runner https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/ --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4733fea..dbe4ec3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, self-hosted-macos-12-arm64, ubuntu-22.04] + os: [macos-12, macos-13-xlarge, ubuntu-22.04] runs-on: ${{ matrix.os }} env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 From a2497822ef8def85a3a4b3bd01e842dc24df2cd8 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 10:11:45 +0800 Subject: [PATCH 03/24] use large intel mac --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbe4ec3..6205b99 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12, macos-13-xlarge, ubuntu-22.04] + # For macOS, large is Intel and XLarge is M1 + # https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners#about-macos-larger-runners + os: [macos-12-large, macos-13-xlarge, ubuntu-22.04] runs-on: ${{ matrix.os }} env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 From 59c521dd53026dd01b8e8988f288e59685870748 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 10:31:55 +0800 Subject: [PATCH 04/24] ? --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6205b99..488dcc3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,6 +16,8 @@ jobs: env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 steps: + - name: Print clang version + run: clang --version - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From 9af2c7fe41cce608a71980450d2dbc28c4357750 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 10:40:51 +0800 Subject: [PATCH 05/24] 1 --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 488dcc3..25e0054 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,10 @@ jobs: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 steps: - name: Print clang version - run: clang --version + run: | + clang --version + + echo "CPLUS_INCLUDE_PATH: $CPLUS_INCLUDE_PATH" - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From fcfb615bcfa9730c23f41e975498c8f697403a86 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 10:45:37 +0800 Subject: [PATCH 06/24] try --- .github/workflows/tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 25e0054..7677bdd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,11 +16,15 @@ jobs: env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 steps: - - name: Print clang version + - name: Fix for m1 + if: matrix.os == 'macos-13-xlarge' run: | clang --version echo "CPLUS_INCLUDE_PATH: $CPLUS_INCLUDE_PATH" + + # https://apple.stackexchange.com/questions/458062/unable-to-find-include-file-on-newly-updated-macosc-c/459037 + rm -rf /Library/Developer/CommandLineTools/MacOSX13.sdk - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From fddae9e899a802744efce951ccf1a7748e2e719c Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 11:05:36 +0800 Subject: [PATCH 07/24] fix --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7677bdd..2ab8642 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: echo "CPLUS_INCLUDE_PATH: $CPLUS_INCLUDE_PATH" # https://apple.stackexchange.com/questions/458062/unable-to-find-include-file-on-newly-updated-macosc-c/459037 - rm -rf /Library/Developer/CommandLineTools/MacOSX13.sdk + rm -rf /Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From 4eecfb3d580e128c65825cc4eb256f8bb91c19e7 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 12:32:02 +0800 Subject: [PATCH 08/24] fix --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ab8642..d457309 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,8 +23,9 @@ jobs: echo "CPLUS_INCLUDE_PATH: $CPLUS_INCLUDE_PATH" + ls /Library/Developer/CommandLineTools/SDKs # https://apple.stackexchange.com/questions/458062/unable-to-find-include-file-on-newly-updated-macosc-c/459037 - rm -rf /Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk + sudo rm -rf /Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From 96b85298ac68f97a638187df0e44ac4d5b664bb3 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 16:57:44 +0800 Subject: [PATCH 09/24] try try --- .github/workflows/tests.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d457309..fd716d4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,16 +16,10 @@ jobs: env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 steps: - - name: Fix for m1 - if: matrix.os == 'macos-13-xlarge' + - name: Fix mac build + if: matrix.os == 'macos-13-xlarge' || matrix.os == 'macos-12-large' run: | - clang --version - - echo "CPLUS_INCLUDE_PATH: $CPLUS_INCLUDE_PATH" - - ls /Library/Developer/CommandLineTools/SDKs - # https://apple.stackexchange.com/questions/458062/unable-to-find-include-file-on-newly-updated-macosc-c/459037 - sudo rm -rf /Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk + xcode-select --install - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From ca5901eb318972524ca4462fbbe88b5e6ac131ac Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 17:00:39 +0800 Subject: [PATCH 10/24] try try --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fd716d4..83ddb0c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: - name: Fix mac build if: matrix.os == 'macos-13-xlarge' || matrix.os == 'macos-12-large' run: | - xcode-select --install + export CXXFLAGS="c++11" - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master From b0a2903ec23acc1cc1637964220bcfc53cfeb153 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 17:34:39 +0800 Subject: [PATCH 11/24] try try --- .github/workflows/tests.yml | 4 ---- Formula/risingwave.rb | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 83ddb0c..6205b99 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,10 +16,6 @@ jobs: env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 steps: - - name: Fix mac build - if: matrix.os == 'macos-13-xlarge' || matrix.os == 'macos-12-large' - run: | - export CXXFLAGS="c++11" - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index fd980fb..248364b 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -14,6 +14,8 @@ class Risingwave < Formula depends_on "openssl@3" depends_on "xz" + env :std + def install # this will install the necessary cargo/rustup toolchain bits in HOMEBREW_CACHE system "#{Formula["rustup-init"].bin}/rustup-init", From 5edc7a66fe590f2888a731dfd261e4b1bb3ec962 Mon Sep 17 00:00:00 2001 From: xxchan Date: Wed, 11 Oct 2023 17:47:32 +0800 Subject: [PATCH 12/24] ?? --- Formula/risingwave.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 248364b..10a0d36 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -14,8 +14,6 @@ class Risingwave < Formula depends_on "openssl@3" depends_on "xz" - env :std - def install # this will install the necessary cargo/rustup toolchain bits in HOMEBREW_CACHE system "#{Formula["rustup-init"].bin}/rustup-init", @@ -23,6 +21,8 @@ def install "--default-toolchain", "none" ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" + ENV.cxx11 + ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 system "cargo", "install", "--bin", "risingwave", From bf007319206cb8ae6c971cc49db9f58223fefca6 Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 09:47:54 +0800 Subject: [PATCH 13/24] what --- Formula/risingwave.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 10a0d36..0c27bda 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -14,6 +14,8 @@ class Risingwave < Formula depends_on "openssl@3" depends_on "xz" + env :std + def install # this will install the necessary cargo/rustup toolchain bits in HOMEBREW_CACHE system "#{Formula["rustup-init"].bin}/rustup-init", From 60af498d8ab72f2e3f16493325335cb64f1a1ef3 Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 10:06:04 +0800 Subject: [PATCH 14/24] try removing llvm --- Formula/risingwave.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 0c27bda..d896eaa 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -8,7 +8,7 @@ class Risingwave < Formula head "https://github.com/risingwavelabs/risingwave.git", branch: "main" depends_on "cmake" => :build - depends_on "llvm" => :build + # depends_on "llvm" => :build depends_on "protobuf" => :build depends_on "rustup-init" => :build depends_on "openssl@3" From 0bcd321c71b91f069d61fb8fb6878ef97682bc0a Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 10:13:50 +0800 Subject: [PATCH 15/24] ? --- Formula/risingwave.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index d896eaa..c41752d 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -8,7 +8,6 @@ class Risingwave < Formula head "https://github.com/risingwavelabs/risingwave.git", branch: "main" depends_on "cmake" => :build - # depends_on "llvm" => :build depends_on "protobuf" => :build depends_on "rustup-init" => :build depends_on "openssl@3" From d604b1a98fa1d7236e2000b05563a9b9ff4db4e4 Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 10:27:37 +0800 Subject: [PATCH 16/24] fix --- Formula/risingwave.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index c41752d..482d3c9 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -25,6 +25,7 @@ def install ENV.cxx11 ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 + ENV.append "RUSTFLAGS", "" system "cargo", "install", "--bin", "risingwave", "--features", "rw-static-link", From 43d6a10ecea45cc89982a5e2ce286758d0bb5c52 Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 10:42:57 +0800 Subject: [PATCH 17/24] ..... --- .github/workflows/tests.yml | 2 +- Formula/risingwave.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6205b99..be03be3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: - run: brew test-bot --only-tap-syntax - - run: brew test-bot --only-formulae + - run: brew test-bot --only-formulae --fail-fast if: github.event_name == 'pull_request' env: HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }} # required diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 482d3c9..09c8913 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -13,8 +13,6 @@ class Risingwave < Formula depends_on "openssl@3" depends_on "xz" - env :std - def install # this will install the necessary cargo/rustup toolchain bits in HOMEBREW_CACHE system "#{Formula["rustup-init"].bin}/rustup-init", @@ -22,8 +20,6 @@ def install "--default-toolchain", "none" ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" - ENV.cxx11 - ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 ENV.append "RUSTFLAGS", "" system "cargo", "install", From a214998df7664f191225500992c5daa04ccfc3e6 Mon Sep 17 00:00:00 2001 From: xxchan Date: Thu, 12 Oct 2023 12:47:35 +0800 Subject: [PATCH 18/24] ? --- Formula/risingwave.rb | 2 ++ test_locally.sh | 4 ++++ 2 files changed, 6 insertions(+) create mode 100755 test_locally.sh diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 09c8913..a70160e 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -20,6 +20,8 @@ def install "--default-toolchain", "none" ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" + ENV.cxx11 + ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 ENV.append "RUSTFLAGS", "" system "cargo", "install", diff --git a/test_locally.sh b/test_locally.sh new file mode 100755 index 0000000..a361e14 --- /dev/null +++ b/test_locally.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +brew uninstall risingwave +brew install -v --build-from-source --HEAD Formula/risingwave.rb \ No newline at end of file From 347cccea925ceb272df48a71327675fe43ba2b48 Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 13 Oct 2023 17:03:15 +0800 Subject: [PATCH 19/24] try try fixing ci --- .github/workflows/tests.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be03be3..eeec035 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,14 +38,33 @@ jobs: - run: brew test-bot --only-tap-syntax - - run: brew test-bot --only-formulae --fail-fast + - run: brew test-bot --only-formulae if: github.event_name == 'pull_request' env: HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }} # required - + + - name: Failures Summary and Bottle Result + if: always() + uses: Homebrew/actions/failures-summary-and-bottle-result@master + with: + workdir: ${{ github.workspace }} + result_path: bottles/steps_output.txt + step_name: 'Build failure summary on ${{ matrix.os }}' + collapse: 'true' + - name: Upload bottles as artifact if: always() && github.event_name == 'pull_request' uses: actions/upload-artifact@main with: name: bottles path: '*.bottle.*' + + - name: Post comment + uses: Homebrew/actions/post-comment@master + with: + token: ${{ github.token }} + issue: ${{ github.event.number }} + body: ":x: @${{github.actor}} bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." + bot_body: ":x: Bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." + bot: BrewTestBot + \ No newline at end of file From aa1ea65b701a43d6c86c321e929f134018ab403b Mon Sep 17 00:00:00 2001 From: xxchan Date: Sun, 15 Oct 2023 00:08:15 +0800 Subject: [PATCH 20/24] try try --- .github/workflows/tests.yml | 4 ++-- Formula/risingwave.rb | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eeec035..fed8c19 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,7 +64,7 @@ jobs: with: token: ${{ github.token }} issue: ${{ github.event.number }} - body: ":x: @${{github.actor}} bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." - bot_body: ":x: Bottle request [failed](${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." + body: "@${{github.actor}} bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." + bot_body: "Bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." bot: BrewTestBot \ No newline at end of file diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index a70160e..522fb26 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -23,7 +23,13 @@ def install ENV.cxx11 ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 - ENV.append "RUSTFLAGS", "" + # Homebrew changes cxx flags, and CMake doesn't pick them up, so rdkafka-sys build fails. + # We cannot pass CMake flags (`std_cmake_args`) because it's in their build.rs. + # + # Some refs that might be useful: + # https://github.com/Homebrew/homebrew-core/pull/51949#issuecomment-601943075 + # https://github.com/Homebrew/brew/pull/7134 + ENV["SDKROOT"] = MacOS.sdk_path_if_needed system "cargo", "install", "--bin", "risingwave", "--features", "rw-static-link", From 5da85a752b3521958a354bfed0079b2a34236ac9 Mon Sep 17 00:00:00 2001 From: xxchan Date: Sun, 15 Oct 2023 00:10:26 +0800 Subject: [PATCH 21/24] revert changes --- Formula/risingwave.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Formula/risingwave.rb b/Formula/risingwave.rb index 522fb26..0ea512e 100644 --- a/Formula/risingwave.rb +++ b/Formula/risingwave.rb @@ -8,6 +8,7 @@ class Risingwave < Formula head "https://github.com/risingwavelabs/risingwave.git", branch: "main" depends_on "cmake" => :build + depends_on "llvm" => :build depends_on "protobuf" => :build depends_on "rustup-init" => :build depends_on "openssl@3" @@ -20,8 +21,6 @@ def install "--default-toolchain", "none" ENV.prepend_path "PATH", HOMEBREW_CACHE/"cargo_cache/bin" - ENV.cxx11 - ENV.delete "RUSTFLAGS" # https://github.com/Homebrew/brew/pull/15544#issuecomment-1628639703 # Homebrew changes cxx flags, and CMake doesn't pick them up, so rdkafka-sys build fails. # We cannot pass CMake flags (`std_cmake_args`) because it's in their build.rs. From c03309a8ab5842edba6e14e6ff3542db7ab7c739 Mon Sep 17 00:00:00 2001 From: xxchan Date: Sun, 15 Oct 2023 10:13:45 +0800 Subject: [PATCH 22/24] try macos13-large --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fed8c19..df3df45 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: matrix: # For macOS, large is Intel and XLarge is M1 # https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners#about-macos-larger-runners - os: [macos-12-large, macos-13-xlarge, ubuntu-22.04] + os: [macos-13-large, macos-13-xlarge, ubuntu-22.04] runs-on: ${{ matrix.os }} env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049 From caf997a2ac5bd2a15a02b6607da216eda9eb9c89 Mon Sep 17 00:00:00 2001 From: xxchan Date: Sun, 15 Oct 2023 10:34:13 +0800 Subject: [PATCH 23/24] remove comment --- .github/workflows/tests.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df3df45..803343e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,13 +58,3 @@ jobs: with: name: bottles path: '*.bottle.*' - - - name: Post comment - uses: Homebrew/actions/post-comment@master - with: - token: ${{ github.token }} - issue: ${{ github.event.number }} - body: "@${{github.actor}} bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." - bot_body: "Bottle request for ${{ runner.os }} (${{github.event.repository.html_url}}/actions/runs/${{github.run_id}})." - bot: BrewTestBot - \ No newline at end of file From e0ad712865e542eb74c419b02fa5eb4caf3d9f95 Mon Sep 17 00:00:00 2001 From: xxchan Date: Sun, 15 Oct 2023 10:34:57 +0800 Subject: [PATCH 24/24] add back macos-12 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 803343e..049b035 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: matrix: # For macOS, large is Intel and XLarge is M1 # https://docs.github.com/en/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners#about-macos-larger-runners - os: [macos-13-large, macos-13-xlarge, ubuntu-22.04] + os: [macos-12, macos-13-large, macos-13-xlarge, ubuntu-22.04] runs-on: ${{ matrix.os }} env: HOMEBREW_NO_INSTALL_FROM_API: 1 # https://github.com/Homebrew/brew/issues/15049