From 5d48162cfa2bf92fd852679d54f2db498abf4267 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Sun, 4 Jul 2021 15:10:25 +0200 Subject: [PATCH] Update GHA workflow [skip travis] --- .github/workflows/action.yml | 12 ++++++------ dev-tools/install-nginx-1.sh | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 121b7be13..83d6bf6d3 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -14,12 +14,12 @@ on: branches: - master -services: - nginx: - image: nginx +#services: +# nginx: +# image: nginx # Map port 8080 on the Docker host to port 80 on the nginx container - ports: - - 8080:80 +# ports: +# - 8080:80 jobs: build: @@ -47,7 +47,7 @@ jobs: echo "export TERM=xterm" >> ~/.bashrc source ~/.bashrc ./dev-tools/generate-files.sh - #./dev-tools/install-nginx-1.sh + ./dev-tools/install-nginx-1.sh - name: Debug shell: bash diff --git a/dev-tools/install-nginx-1.sh b/dev-tools/install-nginx-1.sh index cdecfa2bd..aa8c5dd48 100755 --- a/dev-tools/install-nginx-1.sh +++ b/dev-tools/install-nginx-1.sh @@ -69,6 +69,7 @@ echo "${bold}${green}---------------" echo "${bold}${green}Starting Nginx" echo "${bold}${green}---------------" sudo systemctl status nginx.service +sudo systemctl enable nginx.service sudo nginx -t sudo service nginx start #sudo systemctl start nginx @@ -241,7 +242,7 @@ runsetupngxblocker1 loadNginxConf forceUpdateTest1 runupdatengxblocker -#startNginX +startNginX reloadNginX waitforReload forceUpdateTest2