altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

ci: merge main to release(#7602)

Browse source 
ci: merge main to release
This commit is contained in:
Robert Sparks 2024-06-26 16:04:31 -05:00 committed by GitHub
parent 67ccfcfa09 b81677274e
commit b72af9745e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -416,7 +416,7 @@ jobs:
# ----------------------------------------------------------------- # -----------------------------------------------------------------
staging: staging:
name: Deploy to 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] needs: [prepare, release]
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: environment:
@ -441,7 +441,7 @@ jobs:
# ----------------------------------------------------------------- # -----------------------------------------------------------------
prod: prod:
name: Deploy to Production 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] needs: [staging]
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: environment:

1
dev/build/datatracker-start.sh
View file

@ -21,6 +21,7 @@ trap 'trap "" TERM; cleanup' TERM
# start gunicorn in the background so we can trap the TERM signal # start gunicorn in the background so we can trap the TERM signal
gunicorn \ gunicorn \
-c /workspace/gunicorn.conf.py \
--workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \ --workers "${DATATRACKER_GUNICORN_WORKERS:-9}" \
--max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \ --max-requests "${DATATRACKER_GUNICORN_MAX_REQUESTS:-32768}" \
--timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \ --timeout "${DATATRACKER_GUNICORN_TIMEOUT:-180}" \