From f2ab1dec712fe24525e748b47d3e6bb07236a0c1 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Wed, 26 Jun 2024 16:54:15 -0400 Subject: [PATCH 1/2] ci: Update build.yml workflow --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d123d11fed..87d0a72b26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -416,7 +416,7 @@ jobs: # ----------------------------------------------------------------- staging: name: Deploy to Staging - if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging Only' || github.event.inputs.deploy == 'Staging + Prod') }} + if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging Only' || github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }} needs: [prepare, release] runs-on: ubuntu-latest environment: @@ -441,7 +441,7 @@ jobs: # ----------------------------------------------------------------- prod: name: Deploy to Production - if: ${{ !failure() && !cancelled() && github.event.inputs.deploy == 'Staging + Prod' }} + if: ${{ !failure() && !cancelled() && (github.event.inputs.deploy == 'Staging + Prod' || github.ref_name == 'release') }} needs: [staging] runs-on: ubuntu-latest environment: From c7d157e22179d1561d328487f5a0b82b536e17d1 Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Wed, 26 Jun 2024 18:02:26 -0300 Subject: [PATCH 2/2] fix: enable gunicorn log config (#7600) --- dev/build/datatracker-start.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/build/datatracker-start.sh b/dev/build/datatracker-start.sh index c6f9f3bf4c..31cf7a5b7c 100644 --- a/dev/build/datatracker-start.sh +++ b/dev/build/datatracker-start.sh @@ -21,6 +21,7 @@ trap 'trap "" TERM; cleanup' TERM # start gunicorn in the background so we can trap the TERM signal gunicorn \ + -c /workspace/gunicorn.conf.py \ --workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \ --max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \ --timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \