Selaa lähdekoodia

ci: use docker-gen main on dev branch tests

Nicolas Duchon 4 vuotta sitten
vanhempi
commit
b6e9cdc065
2 muutettua tiedostoa jossa 22 lisäystä ja 4 poistoa
  1. 16 4
      .github/workflows/test.yml
  2. 6 0
      Makefile

+ 16 - 4
.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

+ 6 - 0
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