Merge pull request #106 from xsnippet/fix-ci

Fix CI
xsnippet · Jan 11, 2021 · aca894b · aca894b
2 parents 543cdb7 + 1797898
commit aca894b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -68,11 +68,11 @@ jobs:
       - name: Start PostgreSQL and create a database  (Linux)
         if: runner.os == 'Linux'
         run: |
-          sudo service postgresql start
+          sudo systemctl start postgresql.service
           sudo -u postgres createuser -s devel
           sudo -u postgres createdb -O devel devel
           sudo -u postgres psql -c "ALTER USER devel PASSWORD 'devel';" devel
-          echo '::set-env name=ROCKET_DATABASE_URL::postgres://devel:devel@localhost/devel'
+          echo "ROCKET_DATABASE_URL=postgres://devel:devel@localhost/devel" >> $GITHUB_ENV
 
       - name: Start PostgreSQL and create a database (MacOS)
         if: runner.os == 'macOS'
@@ -81,26 +81,26 @@ jobs:
           /usr/local/opt/postgres/bin/createuser -s devel
           /usr/local/opt/postgres/bin/createdb -O devel devel
           /usr/local/opt/postgres/bin/psql -c "ALTER USER devel PASSWORD 'devel';" devel
-          echo '::set-env name=ROCKET_DATABASE_URL::postgres://devel:devel@localhost/devel'
+          echo "ROCKET_DATABASE_URL=postgres://devel:devel@localhost/devel" >> $GITHUB_ENV
 
       - name: Start PostgreSQL and create a database (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          echo '::add-path::C:\Program Files\PostgreSQL\12\bin'
-          echo '::add-path::C:\Program Files\PostgreSQL\12\lib'
-          echo '::set-env name=PQ_LIB_DIR::C:\Program Files\PostgreSQL\12\lib'
-          sc config postgresql-x64-12 start= demand
-          net start postgresql-x64-12
-          "C:\Program Files\PostgreSQL\12\bin\createuser" -s devel
-          "C:\Program Files\PostgreSQL\12\bin\createdb" -O devel devel
-          "C:\Program Files\PostgreSQL\12\bin\psql" -c "ALTER USER devel PASSWORD 'devel';" devel
-          echo '::set-env name=ROCKET_DATABASE_URL::postgres://devel:devel@localhost/devel'
+          echo '$PGROOT\bin' >> $GITHUB_PATH
+          echo '$PGROOT\lib' >> $GITHUB_PATH
+          echo "PQ_LIB_DIR=$PGROOT\lib" >> $GITHUB_ENV
+          sc config postgresql-x64-13 start=demand
+          net start postgresql-x64-13
+          "$PGROOT\bin\createuser" -s devel
+          "$PGROOT\bin\createdb" -O devel devel
+          "$PGROOT\bin\psql" -c "ALTER USER devel PASSWORD 'devel';" devel
+          echo "ROCKET_DATABASE_URL=postgres://devel:devel@localhost/devel" >> $GITHUB_ENV
 
       - name: Install Alembic and psycopg2
         run: |
           python -m pip install --upgrade wheel
-          python -m pip install --upgrade alembic psycopg2
+          python -m pip install --upgrade alembic psycopg2-binary
 
       - name: Run database migrations
         run: |

diff --git a/src/storage/models.rs b/src/storage/models.rs
@@ -37,14 +37,14 @@ impl Snippet {
         changesets: Vec<Changeset>,
         tags: Vec<String>,
     ) -> Self {
-        let mut snippet = Snippet::default();
-        snippet.id = Snippet::random_id(DEFAULT_SLUG_LENGTH);
-        snippet.title = title;
-        snippet.syntax = syntax;
-        snippet.changesets = changesets;
-        snippet.tags = tags;
-
-        snippet
+        Snippet {
+            id: Snippet::random_id(DEFAULT_SLUG_LENGTH),
+            title,
+            syntax,
+            changesets,
+            tags,
+            ..Default::default()
+        }
     }
 
     /// Generate a random unique snippet identifier (slug).
@@ -73,11 +73,11 @@ pub struct Changeset {
 impl Changeset {
     /// Create a new Changeset.
     pub fn new(version: usize, content: String) -> Self {
-        let mut changeset = Changeset::default();
-        changeset.version = version;
-        changeset.content = content;
-
-        changeset
+        Changeset {
+            version,
+            content,
+            ..Default::default()
+        }
     }
 }