Merge pull request lukasheinrich#7 from matthewfeickert/ci/run-on-PR-…

…events ci: Add running on pull_request events
vingar · Mar 20, 2020 · 0726bdc · 0726bdc
2 parents ab60be7 + e70d3d4
commit 0726bdc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: CI/CD
 
 on:
   push:
+  pull_request:
   schedule:
   - cron:  '1 0 * * *'
 
@@ -13,9 +14,13 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Build Docker image
-      run: |
-        docker build . \
-          --file Dockerfile \
-          --tag lukasheinrich/folding:$GITHUB_SHA \
-          --compress
-        docker images
+      if: "!(startsWith(github.ref, 'refs/tags/'))"
+      uses: docker/build-push-action@v1
+      with:
+        repository: lukasheinrich/folding
+        dockerfile: Dockerfile
+        tag_with_sha: true
+        tag_with_ref: true
+        push: false
+    - name: List Built Images
+      run: docker images
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Build and Publish to Registry
-      if: "! ${{ startsWith(github.ref, 'refs/tags/') }}"
+      if: "!(startsWith(github.ref, 'refs/tags/'))"
       uses: docker/build-push-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
@@ -24,7 +24,7 @@ jobs:
         dockerfile: Dockerfile
         tags: latest
     - name: Build and Publish to Registry with Release Tag
-      if: ${{ startsWith(github.ref, 'refs/tags/') }}
+      if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}