Skip to content

Commit

Permalink
Fix the macos ci + reenable the diesel test
Browse files Browse the repository at this point in the history
  • Loading branch information
weiznich committed May 17, 2024
1 parent 88eb126 commit 48373a1
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
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

0 comments on commit 48373a1

Please sign in to comment.