From 01446472dddb3c7ebbe7f69c7269b3461daa9aec Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Thu, 24 Feb 2022 15:08:45 +0100
Subject: [PATCH] Revert "ci: use docker-gen main on dev branch tests"

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c4a173..6be93bd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,16 +3,13 @@ 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:
@@ -42,15 +39,6 @@ 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 60406b6..ab44880 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,6 @@ 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