Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Nov 28, 2024
2 parents 711edc9 + fcb4073 commit 58bc70d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, macos-12, macos-14 ]
os: [ ubuntu-20.04, macos-13, macos-14 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -73,15 +73,15 @@ jobs:
test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-config-version.cmake
test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-targets.cmake
test -f build/setup-libfmt/deps/lib/cmake/fmt/fmt-targets-release.cmake
test -f build/setup-libfmt/deps/lib/pkgconfig/fmt.pc
test -f build/setup-libfmt/deps/lib/pkgconfig/fmt.pc
test-setup-librachive:
name: test setup-librachive on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, macos-12, macos-14 ]
os: [ ubuntu-20.04, macos-13, macos-14 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -106,7 +106,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, macos-12, macos-14 ]
os: [ ubuntu-20.04, macos-13, macos-14 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -128,7 +128,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04, macos-12 ]
os: [ ubuntu-20.04, macos-13 ]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-12, macos-13, macos-14 ]
os: [ macos-13, macos-14 ]

steps:
- name: Checkout
Expand Down
5 changes: 4 additions & 1 deletion ci-scripts/patch-fbthrift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,15 @@ if [[ "$OSTYPE" == "msys" ]]; then
re="#include <fmt\/fmt-format\.h>"
# shellcheck disable=SC2251
! IFS= read -r -d '' sbst << EOM
#include <fmt/fmt-format.h>
#include <fmt\/format.h>
\/* -- Start of tebako patch -- *\/
#include <fmt\/fmt-ranges.h>
\/* -- End of tebako patch -- *\/
EOM

do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.h" "$re" "$sbst"
do_patch_multiline "$1/thrift/compiler/gen/cpp/namespace_resolver.cc" "$re" "$sbst"
do_patch_multiline "$1/thrift/compiler/ast/t_const_value.h" "$re" "$sbst"

fi

0 comments on commit 58bc70d

Please sign in to comment.