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

Fix the macos ci + reenable the diesel test #63

Merged
merged 1 commit into from
May 17, 2024
Merged

Fix the macos ci + reenable the diesel test #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, macos-14, windows-2019]
os: [ubuntu-latest, macos-13, macos-14, windows-2019]
features: [default, bundled, buildtime_bindgen]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -44,10 +44,10 @@ jobs:
sudo service postgresql restart && sleep 3

- name: Install postgres (MacOS)
if: matrix.os == 'macos-latest' && matrix.features != 'bundled'
if: matrix.os == 'macos-13' && matrix.features != 'bundled'
run: |
initdb -D /usr/local/var/postgres
pg_ctl -D /usr/local/var/postgres start
brew install postgresql
brew services start postgresql@14
sleep 3
createuser -s postgres

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
cargo new test_diesel
cd test_diesel
echo "[workspace]" >> Cargo.toml
cargo add diesel --no-default-features --features "postgres"
cargo add diesel --no-default-features --features "postgres" --git "https://github.com/diesel-rs/diesel" --branch master
cargo add pq-sys
echo "[patch.crates-io]" >> Cargo.toml
echo "pq-sys = { path = \"..\" }" >> Cargo.toml
Expand Down
Loading