From cc340b168e4c1c19c96577e2aaede6d43312255e Mon Sep 17 00:00:00 2001
From: Patrick Barrett <patrick@psbarrett.com>
Date: Mon, 15 Feb 2021 03:18:48 -0600
Subject: [PATCH 1/2] use locked dependencies when installing sqlx-cli (#47)

This change is needed to workaround an incompatibility in the latest
release of a deep dependency that causes a conflict in bitvec, see:
https://github.com/launchbadge/sqlx/issues/1048
---
 .github/workflows/general.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
index db27724..ec7cbec 100644
--- a/.github/workflows/general.yml
+++ b/.github/workflows/general.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Migrate database
         run: |
           sudo apt-get install libpq-dev -y
-          cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
+          cargo install --version=0.5.1 --locked sqlx-cli --no-default-features --features postgres
           SKIP_DOCKER=true ./scripts/init_db.sh
       - uses: actions-rs/cargo@v1
         with:
@@ -81,7 +81,7 @@ jobs:
       - name: Migrate database
         run: |
           sudo apt-get install libpq-dev -y
-          cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
+          cargo install --version=0.5.1 --locked sqlx-cli --no-default-features --features postgres
           SKIP_DOCKER=true ./scripts/init_db.sh
       - uses: actions-rs/clippy-check@v1
         with:
@@ -113,7 +113,7 @@ jobs:
       - name: Migrate database
         run: |
           sudo apt-get install libpq-dev -y
-          cargo install --version=0.5.1 sqlx-cli --no-default-features --features postgres
+          cargo install --version=0.5.1 --locked sqlx-cli --no-default-features --features postgres
           SKIP_DOCKER=true ./scripts/init_db.sh
       - name: Run cargo-tarpaulin
         uses: actions-rs/tarpaulin@v0.1

From d89c2a36c6196cdc5bc3efa83557980a9cd3934f Mon Sep 17 00:00:00 2001
From: Moises Marquez <55683710+moises-marquez@users.noreply.github.com>
Date: Mon, 15 Feb 2021 10:21:49 +0100
Subject: [PATCH 2/2] Cache cargo dependencies (#45)

---
 .github/workflows/general.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
index ec7cbec..13eaf81 100644
--- a/.github/workflows/general.yml
+++ b/.github/workflows/general.yml
@@ -30,6 +30,15 @@ jobs:
           - 5432:5432
     steps:
       - uses: actions/checkout@v2
+      - name: Cache dependencies
+        id: cache-dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal