Merge pull request #199 from pzelnip/githubactions

pzelnip · web-flow · commit 76181a72647a · 2021-03-07T14:40:32.000-08:00
Lets try github actions instead of the garbage that is Travis
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,31 @@
+name: Build the Site
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the mainline branch
+on:
+  pull_request:
+    branches: [ mainline ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    # container: pzelnip/codependentcodrbase:latest
+    env:
+      DOCKER_USERNAME: pzelnip
+
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    - name: Print env vars
+      run: echo "$GITHUB_REF -- $GITHUB_EVENT_NAME -- $GITHUB_SHA -- $GITHUB_HEAD_REF -- $GITHUB_BASE_REF"
+
+    # Runs a single command using the runners shell
+    - name: Run tests
+      shell: 'script -q -e -c "bash {0}"'
+      run: make GH_TOKEN=foobar TRAVIS_BRANCH=$GITHUB_HEAD_REF test
+      env:
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,9 @@ services:
 - docker
 
 script:
+# use travis to only build if merged to mainline, GH actions now cover PRs
 - if [ "$TRAVIS_BRANCH" = "mainline" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  make deploy; else make test; fi
+  make deploy; fi
 
 notifications:
     email: false
diff --git a/Makefile b/Makefile
@@ -86,6 +86,7 @@ bandit:
 	docker run -it --rm $(SITE_NAME):latest bandit . -r
 
 blackenit: dockerbuild
+	echo "-----${GH_TOKEN}------${TRAVIS_BRANCH}-----"
 	./black_out.sh ${GH_TOKEN} ${TRAVIS_BRANCH}
 
 test: blackenit lint_the_things bandit
diff --git a/black_out.sh b/black_out.sh
@@ -11,28 +11,28 @@ fi
 echo "Blackening code for $2...."
 
 # Run black over the code
-docker run -it --rm -v `pwd`:/build codependentcodr:latest black .
-
-# if no changes, then exit cleanly
-if [ -z "$(git status --porcelain)" ]; then
-    exit 0
-else
-    # else lets commit the blackening...
-
-    echo "Dirty directory"
-
-    # Have to check out the branch because Travis is dumb, on
-    # a branch build it checks out a detached HEAD instead of
-    # the branch itself
-    echo "Checking out $2"
-    git checkout $2
-
-    # commit the changes
-    git commit -am "BLACK-123 Automated Black out"
-
-    # push back to Github & abort the build since a new build will
-    # get triggered by the push
-    git push https://$1@github.com/pzelnip/www.codependentcodr.com $2
-    echo "Blackened changes, aborting build"
-    exit 1
-fi
+docker run -it --rm -v `pwd`:/build codependentcodr:latest black --check .
+
+# # if no changes, then exit cleanly
+# if [ -z "$(git status --porcelain)" ]; then
+#     exit 0
+# else
+#     # else lets commit the blackening...
+
+#     echo "Dirty directory"
+
+#     # Have to check out the branch because Travis is dumb, on
+#     # a branch build it checks out a detached HEAD instead of
+#     # the branch itself
+#     # echo "Checking out $2"
+#     # git checkout $2
+
+#     # # commit the changes
+#     # git commit -am "BLACK-123 Automated Black out"
+
+#     # push back to Github & abort the build since a new build will
+#     # get triggered by the push
+#     # git push https://$1@github.com/pzelnip/www.codependentcodr.com $2
+#     echo "Blackened changes, aborting build"
+#     exit 1
+# fi
