Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support macOS >= 10.15 #7332

Merged
merged 11 commits into from
Aug 21, 2023
Merged

fix: support macOS >= 10.15 #7332

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
494d7dd
fix: Patch macOS's rocksdb
marc2332 Aug 18, 2023
45e64a5
fix: Run cargo install with nightly
marc2332 Aug 18, 2023
f0560da
fix: Install nightly
marc2332 Aug 18, 2023
22c7c8a
fix: Add empty line at the end of of files
marc2332 Aug 18, 2023
56758d5
fix: Downgrade to MacOS 11
marc2332 Aug 18, 2023
23e54dd
fix: Target MacOS 10.14
marc2332 Aug 18, 2023
789dc83
fix: Use default rust toolchain
marc2332 Aug 18, 2023
43a86ac
fix: Run with macos-13
marc2332 Aug 18, 2023
41c6a51
fix: Remove unused patches
marc2332 Aug 21, 2023
8c80dda
chore: Update step name
marc2332 Aug 21, 2023
c578289
fix: Do not install rust nightly toolchain and lock cargo-patch to 0.3.1
marc2332 Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build-desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,18 @@ jobs:

- name: Apply neon-sys patch (Windows)
run: |
cargo install cargo-patch
cargo install cargo-patch --version 0.3.1
cp ${{ github.workspace }}\manual-patches\neon_temp_buf.patch .
git apply --ignore-space-change --ignore-whitespace ${{ github.workspace }}\manual-patches\windows_cargo_toml.patch
cat Cargo.toml
cargo patch
working-directory: packages/backend/bindings/node/native
if: matrix.os == 'windows-latest'

- name: Set deployment target (macOS)
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV
if: matrix.os == 'macos-13'

- name: Install required packages (Linux)
run: |
sudo apt update
Expand Down
Loading