From 03cc8c075f86f1bd9e2c4e29872a0e8b9072c7f0 Mon Sep 17 00:00:00 2001
From: Doug Tangren <d.tangren@gmail.com>
Date: Sun, 10 Jan 2021 02:11:35 -0500
Subject: update gh actions ci and fix ci lint errors (#244)

* update gh actions ci and fix ci lint errors

* trigger also on master for now
---
 .github/workflows/main.yml | 27 ++++++++++++++++++++-------
 src/builder.rs             |  9 ++++-----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 80c2290..9797347 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,22 @@
 name: Main
 
-on: push
+on:
+  workflow_dispatch:
+  push:
+    paths-ignore:
+      - '*.md'
+    branches:
+      - main
+      - master
+  pull_request:
+    paths-ignore:
+      - '*.md'
+    branches:
+      - main
+      - master
+
+env:
+  CARGO_TERM_COLOR:  always
 
 jobs:
   codestyle:
@@ -75,13 +91,10 @@ jobs:
           cargo doc --no-deps
           echo "<meta http-equiv=refresh content=0;url=`echo ${{ github.repository }} | cut -d / -f 2 | tr '-' '_'`/index.html>" > target/doc/index.html
       - name: Publish
-        uses: docker://peaceiris/gh-pages:v2.3.1
-        env:
-          PUBLISH_BRANCH: gh-pages
-          PUBLISH_DIR: ./target/doc
-          PERSONAL_TOKEN: ${{ secrets.GH_PAGES_TOKEN }}
+        uses: peaceiris/actions-gh-pages@v3
         with:
-          emptyCommits: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./target/doc
 
   publish-crate:
     if: startsWith(github.ref, 'refs/tags/')
diff --git a/src/builder.rs b/src/builder.rs
index eba3536..312b499 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -858,8 +858,9 @@ impl ContainerOptionsBuilder {
         &mut self,
         envs: E,
     ) -> &mut Self
-        where S: AsRef<str> + Serialize,
-              E: AsRef<[S]> + Serialize
+    where
+        S: AsRef<str> + Serialize,
+        E: AsRef<[S]> + Serialize,
     {
         self.params.insert("Env", json!(envs));
         self
@@ -1707,9 +1708,7 @@ mod tests {
             .map(|s| String::from(*s))
             .collect();
 
-        let options = ContainerOptionsBuilder::new("test_image")
-            .env(&env)
-            .build();
+        let options = ContainerOptionsBuilder::new("test_image").env(&env).build();
 
         assert_eq!(
             r#"{"Env":["foo","bar","baz"],"HostConfig":{},"Image":"test_image"}"#,
-- 
cgit v1.2.3