thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-04-16 18:51:01 +00:00
Code Issues Releases Wiki Activity

Revert "ci: use docker-gen main on dev branch tests"

Browse Source 
This reverts commit b6e9cdc065a19ce7e7cb0dcf2c11cd7c9fe1d063.
This commit is contained in:
Nicolas Duchon 2022-02-24 15:08:45 +01:00
parent 08c9586346
commit 01446472dd
No known key found for this signature in database
GPG Key ID: 91EF7BB1EECB961A
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/test.yml vendored
View File

@ -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

6
Makefile
View File

@ -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