From 3ef1ff797244f9014c204ff3c9a18b866195c1a8 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Fri, 27 Nov 2020 08:33:08 +0100
Subject: [PATCH] Test images before pushing them (#114)

* Test images before pushing them

* Wording

* Only trigger CI when we change a layer

* Blackfire fix

* syntax
---
 .github/workflows/ci.yml            | 13 ++++++-------
 .github/workflows/deploy-docker.yml |  3 +++
 layers/blackfire/versions.json      |  3 +--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2d6b53d..5d3566b2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,10 +1,9 @@
 name: CI
 
 on:
-  pull_request: ~
-  push:
-    branches:
-      - master
+  pull_request:
+    paths:
+      - layers/**
 
 jobs:
   build:
@@ -44,8 +43,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build layer
+      - name: Build docker images
         run: layer=${{ matrix.layer }} make docker-images
 
-      - name: Test layer
-        run:  layer=${{ matrix.layer }} make test
+      - name: Test images
+        run: layer=${{ matrix.layer }} make test
diff --git a/.github/workflows/deploy-docker.yml b/.github/workflows/deploy-docker.yml
index 84095185..768dcb89 100644
--- a/.github/workflows/deploy-docker.yml
+++ b/.github/workflows/deploy-docker.yml
@@ -30,6 +30,9 @@ jobs:
       - name: Build images
         run: make docker-images
 
+      - name: Test images
+        run: make test
+
       - name: Publish
         env:
           DOCKER_TAG: ${{ steps.get_version.outputs.VERSION }}
diff --git a/layers/blackfire/versions.json b/layers/blackfire/versions.json
index 7647761a..7ef42130 100644
--- a/layers/blackfire/versions.json
+++ b/layers/blackfire/versions.json
@@ -1,5 +1,4 @@
 {
-    "72": "1.44.0",
     "73": "1.46.0",
     "74": "1.46.0"
-}
\ No newline at end of file
+}