diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index a2a85604e..fa27c99ce 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -105,13 +105,6 @@ jobs: shell: bash run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev - - name: Install fmt on macOS - if: ${{ startsWith(matrix.os, 'macos') }} - shell: bash - run: | - brew install fmt - echo "CMAKE_PREFIX_PATH=$(brew --prefix fmt):${CMAKE_PREFIX_PATH:-}" >> "${GITHUB_ENV}" - - name: Verify run: | tar_gz=$(echo apache-iceberg-cpp-*.tar.gz) diff --git a/.github/workflows/s3_test.yml b/.github/workflows/s3_test.yml index 415477b2f..0cf8e8b1e 100644 --- a/.github/workflows/s3_test.yml +++ b/.github/workflows/s3_test.yml @@ -75,12 +75,6 @@ jobs: run: | echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV - - name: Install fmt on macOS - if: ${{ startsWith(matrix.runs-on, 'macos') }} - shell: bash - run: | - brew install fmt - echo "CMAKE_PREFIX_PATH=$(brew --prefix fmt):${CMAKE_PREFIX_PATH:-}" >> "${GITHUB_ENV}" - name: Start MinIO shell: bash run: bash ci/scripts/start_minio.sh diff --git a/.github/workflows/sql_catalog_test.yml b/.github/workflows/sql_catalog_test.yml index be0837745..7d93e984d 100644 --- a/.github/workflows/sql_catalog_test.yml +++ b/.github/workflows/sql_catalog_test.yml @@ -80,12 +80,6 @@ jobs: run: | echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV - - name: Install dependencies on macOS - if: ${{ startsWith(matrix.runs-on, 'macos') }} - shell: bash - run: | - brew install fmt - echo "CMAKE_PREFIX_PATH=$(brew --prefix fmt):${CMAKE_PREFIX_PATH:-}" >> "${GITHUB_ENV}" - name: Install dependencies on Windows if: ${{ startsWith(matrix.runs-on, 'windows') }} shell: pwsh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ea0c94204..41bdd4b97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,11 +77,6 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - - name: Install fmt - shell: bash - run: | - brew install fmt - echo "CMAKE_PREFIX_PATH=$(brew --prefix fmt):${CMAKE_PREFIX_PATH:-}" >> "${GITHUB_ENV}" - name: Build Iceberg shell: bash run: ci/scripts/build_iceberg.sh $(pwd) diff --git a/cmake_modules/IcebergThirdpartyToolchain.cmake b/cmake_modules/IcebergThirdpartyToolchain.cmake index 3b4340cf5..9b5d95a7e 100644 --- a/cmake_modules/IcebergThirdpartyToolchain.cmake +++ b/cmake_modules/IcebergThirdpartyToolchain.cmake @@ -226,7 +226,7 @@ function(resolve_avro_dependency) fetchcontent_declare(avro-cpp ${FC_DECLARE_COMMON_OPTIONS} GIT_REPOSITORY ${AVRO_GIT_REPOSITORY} - GIT_TAG 11fb55500bed9fbe9af53b85112cd13887f0ce80 + GIT_TAG 997d50d312613e921598aaed30b082f9bcf9c6ea SOURCE_SUBDIR lang/c++ FIND_PACKAGE_ARGS