From b6e9cdc065a19ce7e7cb0dcf2c11cd7c9fe1d063 Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Tue, 4 May 2021 11:03:27 +0200
Subject: [PATCH] ci: use docker-gen main on dev branch tests

---
 .github/workflows/test.yml | 20 ++++++++++++++++----
 Makefile                   |  6 ++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6be93bd..8c4a173 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,13 +3,16 @@ name: Tests
 on:
   workflow_dispatch:
   push:
+    branches:
+      - main
+      - dev
     paths-ignore:
-    - 'LICENSE'
-    - '**.md'
+      - 'LICENSE'
+      - '**.md'
   pull_request:
     paths-ignore:
-    - 'LICENSE'
-    - '**.md'
+      - 'LICENSE'
+      - '**.md'
 
 jobs:
   unit:
@@ -39,6 +42,15 @@ jobs:
 
       - name: Build Docker nginx proxy test image
         run: make build-nginx-proxy-test-${{ matrix.base_docker_image }}
+        if: |
+          ( github.event_name == 'push' && github.ref != 'refs/heads/dev' ) ||
+          ( github.event_name == 'pull_request' && github.base_ref != 'dev' )
+
+      - name: Build Docker nginx proxy dev test image
+        run: make build-nginx-proxy-test-${{ matrix.base_docker_image }}-dev
+        if: |
+          ( github.event_name == 'push' && github.ref == 'refs/heads/dev' ) ||
+          ( github.event_name == 'pull_request' && github.base_ref == 'dev' )
 
       - name: Run tests
         run: pytest
diff --git a/Makefile b/Makefile
index ab44880..60406b6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,12 @@ build-nginx-proxy-test-debian:
 build-nginx-proxy-test-alpine:
 	docker build --build-arg NGINX_PROXY_VERSION="test" -f Dockerfile.alpine -t nginxproxy/nginx-proxy:test .
 
+build-nginx-proxy-test-debian-dev:
+	docker build --build-arg DOCKER_GEN_VERSION=main -t nginxproxy/nginx-proxy:test .
+
+build-nginx-proxy-test-alpine-dev:
+	docker build -f Dockerfile.alpine --build-arg DOCKER_GEN_VERSION=main -t nginxproxy/nginx-proxy:test .
+
 test-debian: build-webserver build-nginx-proxy-test-debian
 	test/pytest.sh