Skip to content

Commit

Permalink
Bump toolchain to 1.82
Browse files Browse the repository at this point in the history
  • Loading branch information
weiznich committed Oct 18, 2024
1 parent 77ca1a3 commit b0f8d59
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 53 deletions.
46 changes: 23 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ concurrency:
jobs:
check_and_test:
name: Check
needs: [sqlite_bundled, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
#needs: [sqlite_bundled, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -80,18 +80,18 @@ jobs:
- name: Install postgres (MacOS)
if: matrix.os == 'macos-13' && matrix.backend == 'postgres'
run: |
brew install postgresql@14
brew services start postgresql@14
brew install postgresql@17
brew services start postgresql@17
sleep 3
createuser -s postgres
echo "PG_DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres@localhost/diesel_example" >> $GITHUB_ENV
- name: Install postgres (MacOS M1)
if: matrix.os == 'macos-14' && matrix.backend == 'postgres'
if: matrix.os == 'macos-15' && matrix.backend == 'postgres'
run: |
brew install postgresql@14
brew services start postgresql@14
brew install postgresql@17
brew services start postgresql@17
sleep 3
createuser -s postgres
echo "PG_DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
Expand All @@ -107,31 +107,31 @@ jobs:
- name: Install mysql (MacOS)
if: matrix.os == 'macos-13' && matrix.backend == 'mysql'
run: |
brew install mariadb@10.11
/usr/local/opt/mariadb@10.11/bin/mysql_install_db
/usr/local/opt/mariadb@10.11/bin/mysql.server start
brew install mariadb@11.5
/usr/local/opt/mariadb@11.5/bin/mysql_install_db
/usr/local/opt/mariadb@11.5/bin/mysql.server start
sleep 3
/usr/local/opt/mariadb@10.11/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
echo "MYSQL_DATABASE_URL=mysql://runner@127.0.0.1/diesel_test" >> $GITHUB_ENV
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://runner@127.0.0.1/diesel_example" >> $GITHUB_ENV
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://runner@127.0.0.1/diesel_unit_test" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIB_DIR=/usr/local/opt/mariadb@10.11/lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=10.11" >> $GITHUB_ENV
/usr/local/opt/mariadb@11.5/bin/mysql -e "create database diesel_test; create database diesel_unit_test; CREATE USER 'diesel'@'%' IDENTIFIED BY 'diesel'; grant all on \`diesel_%\`.* to 'diesel'@'%';" -urunner
echo "MYSQL_DATABASE_URL=mysql://diesel:diesel@127.0.0.1/diesel_test" >> $GITHUB_ENV
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://diesel:diesel@127.0.0.1/diesel_example" >> $GITHUB_ENV
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://diesel:diesel@127.0.0.1/diesel_unit_test" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIB_DIR=/usr/local/opt/mariadb@11.5/lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=11.5" >> $GITHUB_ENV
- name: Install mysql (MacOS M1)
if: matrix.os == 'macos-14' && matrix.backend == 'mysql'
if: matrix.os == 'macos-15' && matrix.backend == 'mysql'
run: |
brew install mariadb@10.11
ls /opt/homebrew/opt/mariadb@10.11
/opt/homebrew/opt/mariadb@10.11/bin/mysql_install_db
/opt/homebrew/opt/mariadb@10.11/bin/mysql.server start
brew install mariadb@11.5
ls /opt/homebrew/opt/mariadb@11.5
/opt/homebrew/opt/mariadb@11.5/bin/mysql_install_db
/opt/homebrew/opt/mariadb@11.5/bin/mysql.server start
sleep 3
/opt/homebrew/opt/mariadb@10.11/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
/opt/homebrew/opt/mariadb@11.5/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
echo "MYSQL_DATABASE_URL=mysql://[email protected]/diesel_test" >> $GITHUB_ENV
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://[email protected]/diesel_example" >> $GITHUB_ENV
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://[email protected]/diesel_unit_test" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIB_DIR=/opt/homebrew/opt/mariadb@10.11/lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=10.11" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIB_DIR=/opt/homebrew/opt/mariadb@11.5/lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=11.5" >> $GITHUB_ENV
- name: Install sqlite (Windows)
if: runner.os == 'Windows' && matrix.backend == 'sqlite'
Expand Down
50 changes: 25 additions & 25 deletions diesel_compile_tests/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion diesel_compile_tests/tests/fail/auto_type.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ error[E0107]: type alias takes 0 generic arguments but 1 generic argument was su
36 | | .filter(user_has_post_with_id_greater_than(id_greater_than))
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
| |_________________|________________________________|
| | help: remove these generics
| | help: remove the unnecessary generics
| expected 0 generic arguments
|
note: type alias defined here, with 0 generic parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ error[E0505]: cannot move out of `buf` because it is borrowed
|
help: consider cloning the value if the performance cost is acceptable
|
11 - let query = diesel::select((&buf as &[u8]).into_sql::<sql_types::Binary>());
11 + let query = diesel::select((buf.clone() as &[u8]).into_sql::<sql_types::Binary>());
|
11 | let query = diesel::select((&buf.clone() as &[u8]).into_sql::<sql_types::Binary>());
| ++++++++
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.81.0
1.82.0

0 comments on commit b0f8d59

Please sign in to comment.