mirror of
https://github.com/DOI-DO/j40-cejst-2.git
synced 2025-02-22 17:44:20 -08:00
Remove use of strategy matric in PR workflows
This commit is contained in:
parent
44f5aae0ca
commit
0b612fbade
6 changed files with 21 additions and 35 deletions
3
.github/workflows/deploy_backend_main.yml
vendored
3
.github/workflows/deploy_backend_main.yml
vendored
|
@ -60,9 +60,6 @@ jobs:
|
||||||
- name: Get Census Data
|
- name: Get Census Data
|
||||||
run: |
|
run: |
|
||||||
poetry run python3 -m data_pipeline.application census-data-download
|
poetry run python3 -m data_pipeline.application census-data-download
|
||||||
- name: Extract Data Sources
|
|
||||||
run: |
|
|
||||||
poetry run python3 -m data_pipeline.application extract-data-sources
|
|
||||||
- name: Run ETL
|
- name: Run ETL
|
||||||
run: |
|
run: |
|
||||||
poetry run python3 -m data_pipeline.application etl-run
|
poetry run python3 -m data_pipeline.application etl-run
|
||||||
|
|
33
.github/workflows/pr_backend.yml
vendored
33
.github/workflows/pr_backend.yml
vendored
|
@ -4,7 +4,9 @@ on:
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
env:
|
||||||
|
python-version: '3.10'
|
||||||
|
J40_VERSION_LABEL_STRING: ${{ vars.SCORE_VERSION }}
|
||||||
jobs:
|
jobs:
|
||||||
# JOB to run change detection
|
# JOB to run change detection
|
||||||
detect-be-changes:
|
detect-be-changes:
|
||||||
|
@ -26,32 +28,29 @@ jobs:
|
||||||
- 'data/**'
|
- 'data/**'
|
||||||
- '.github/workflows/pr_backend.yml'
|
- '.github/workflows/pr_backend.yml'
|
||||||
code-quality-checks:
|
code-quality-checks:
|
||||||
name: Code quality checks and tests - ${{ matrix.python-version }}
|
name: Code quality checks and tests
|
||||||
needs: detect-be-changes
|
needs: detect-be-changes
|
||||||
if: ${{ needs.detect-be-changes.outputs.backend == 'true' }}
|
if: ${{ needs.detect-be-changes.outputs.backend == 'true' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: data/data-pipeline
|
working-directory: data/data-pipeline
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
python-version: ['3.10']
|
|
||||||
environment: PR
|
environment: PR
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source
|
- name: Checkout source
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Print variables to help debug
|
- name: Print variables to help debug
|
||||||
uses: hmarr/debug-action@v3
|
uses: hmarr/debug-action@v3
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python ${{ env.python-version }}
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ env.python-version }}
|
||||||
- name: Load cached Poetry installation
|
- name: Load cached Poetry installation
|
||||||
id: cached-poetry-dependencies
|
id: cached-poetry-dependencies
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.cache/pypoetry/virtualenvs
|
path: ~/.cache/pypoetry/virtualenvs
|
||||||
key: env-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('.github/workflows/deploy_backend_main.yml') }}
|
key: env-${{ runner.os }}-${{ env.python-version }}-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('.github/workflows/deploy_backend_main.yml') }}
|
||||||
- name: Install poetry
|
- name: Install poetry
|
||||||
uses: snok/install-poetry@v1
|
uses: snok/install-poetry@v1
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
@ -69,32 +68,29 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
poetry run pytest data_pipeline/
|
poetry run pytest data_pipeline/
|
||||||
generate-score-tiles:
|
generate-score-tiles:
|
||||||
name: Score and tile generation - ${{ matrix.python-version }}
|
name: Score and tile generation
|
||||||
needs: detect-be-changes
|
needs: detect-be-changes
|
||||||
if: ${{ needs.detect-be-changes.outputs.backend == 'true' }}
|
if: ${{ needs.detect-be-changes.outputs.backend == 'true' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: data/data-pipeline
|
working-directory: data/data-pipeline
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
python-version: ['3.10']
|
|
||||||
environment: PR
|
environment: PR
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source
|
- name: Checkout source
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Print variables to help debug
|
- name: Print variables to help debug
|
||||||
uses: hmarr/debug-action@v3
|
uses: hmarr/debug-action@v3
|
||||||
- name: Set up Python ${{ matrix.python-version }}
|
- name: Set up Python ${{ env.python-version }}
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ env.python-version }}
|
||||||
- name: Load cached Poetry installation
|
- name: Load cached Poetry installation
|
||||||
id: cached-poetry-dependencies
|
id: cached-poetry-dependencies
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.cache/pypoetry/virtualenvs
|
path: ~/.cache/pypoetry/virtualenvs
|
||||||
key: env-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('.github/workflows/deploy_backend_main.yml') }}
|
key: env-${{ runner.os }}-${{ env.python-version }}-${{ hashFiles('**/poetry.lock') }}-${{ hashFiles('.github/workflows/deploy_backend_main.yml') }}
|
||||||
- name: Install poetry
|
- name: Install poetry
|
||||||
uses: snok/install-poetry@v1
|
uses: snok/install-poetry@v1
|
||||||
- name: Print Poetry settings
|
- name: Print Poetry settings
|
||||||
|
@ -113,9 +109,6 @@ jobs:
|
||||||
- name: Get Census Data
|
- name: Get Census Data
|
||||||
run: |
|
run: |
|
||||||
poetry run python3 -m data_pipeline.application census-data-download
|
poetry run python3 -m data_pipeline.application census-data-download
|
||||||
- name: Extract Data Sources
|
|
||||||
run: |
|
|
||||||
poetry run python3 -m data_pipeline.application extract-data-sources
|
|
||||||
- name: Run ETL
|
- name: Run ETL
|
||||||
run: |
|
run: |
|
||||||
poetry run python3 -m data_pipeline.application etl-run
|
poetry run python3 -m data_pipeline.application etl-run
|
||||||
|
@ -129,10 +122,6 @@ jobs:
|
||||||
- name: Generate Score Post
|
- name: Generate Score Post
|
||||||
run: |
|
run: |
|
||||||
poetry run python3 -m data_pipeline.application generate-score-post
|
poetry run python3 -m data_pipeline.application generate-score-post
|
||||||
- name: Confirm we generated the version of the score we think we did
|
|
||||||
if: ${{ env.J40_VERSION_LABEL_STRING == '1.0' || env.J40_VERSION_LABEL_STRING == 'test' }}
|
|
||||||
run: |
|
|
||||||
grep "Identified as disadvantaged due to tribal overlap" data_pipeline/data/score/downloadable/* > /dev/null
|
|
||||||
- name: Confirm we generated the version of the score we think we did
|
- name: Confirm we generated the version of the score we think we did
|
||||||
if: ${{ env.J40_VERSION_LABEL_STRING == '2.0' || env.J40_VERSION_LABEL_STRING == 'beta' }}
|
if: ${{ env.J40_VERSION_LABEL_STRING == '2.0' || env.J40_VERSION_LABEL_STRING == 'beta' }}
|
||||||
run: |
|
run: |
|
||||||
|
|
11
.github/workflows/pr_frontend.yml
vendored
11
.github/workflows/pr_frontend.yml
vendored
|
@ -4,6 +4,8 @@ on:
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
env:
|
||||||
|
node-version: 14.x
|
||||||
jobs:
|
jobs:
|
||||||
# JOB to run change detection
|
# JOB to run change detection
|
||||||
detect-fe-changes:
|
detect-fe-changes:
|
||||||
|
@ -25,7 +27,7 @@ jobs:
|
||||||
- 'client/**'
|
- 'client/**'
|
||||||
- '.github/workflows/pr_frontend.yml'
|
- '.github/workflows/pr_frontend.yml'
|
||||||
frontend-build:
|
frontend-build:
|
||||||
name: Frontend build - ${{ matrix.node-version }}
|
name: Frontend build
|
||||||
needs: detect-fe-changes
|
needs: detect-fe-changes
|
||||||
if: ${{ needs.detect-fe-changes.outputs.frontend == 'true' }}
|
if: ${{ needs.detect-fe-changes.outputs.frontend == 'true' }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -33,15 +35,12 @@ jobs:
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
working-directory: client
|
working-directory: client
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
node-version: [14.x]
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
- name: Use Node.js ${{ env.node-version }}
|
||||||
uses: actions/setup-node@v2
|
uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: ${{ matrix.node-version }}
|
node-version: ${{ env.node-version }}
|
||||||
- name: Install
|
- name: Install
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[](https://github.com/usds/justice40-tool/actions/workflows/deploy_fe_staging.yml)
|
[](https://github.com/usds/justice40-tool/actions/workflows/deploy_fe_staging.yml)
|
||||||
[](https://github.com/usds/justice40-tool/actions/workflows/deploy_fe_main.yml)
|
[](https://github.com/usds/justice40-tool/actions/workflows/deploy_fe_main.yml)
|
||||||
|
|
||||||
# Justice40 Clientss
|
# Justice40 Client
|
||||||
|
|
||||||
This README contains the following content:
|
This README contains the following content:
|
||||||
|
|
||||||
|
|
|
@ -439,7 +439,6 @@ def full_run(ctx, use_cache):
|
||||||
if not use_cache:
|
if not use_cache:
|
||||||
ctx.invoke(data_cleanup)
|
ctx.invoke(data_cleanup)
|
||||||
ctx.invoke(census_data_download, zip_compress=False, use_cache=use_cache)
|
ctx.invoke(census_data_download, zip_compress=False, use_cache=use_cache)
|
||||||
ctx.invoke(extract_data_sources, dataset=None, use_cache=use_cache)
|
|
||||||
ctx.invoke(etl_run, dataset=None, use_cache=use_cache)
|
ctx.invoke(etl_run, dataset=None, use_cache=use_cache)
|
||||||
ctx.invoke(full_post_etl)
|
ctx.invoke(full_post_etl)
|
||||||
|
|
||||||
|
|
|
@ -160,13 +160,15 @@ DATASET_LIST = [
|
||||||
"name": "census_acs",
|
"name": "census_acs",
|
||||||
"module_dir": "census_acs",
|
"module_dir": "census_acs",
|
||||||
"class_name": "CensusACSETL",
|
"class_name": "CensusACSETL",
|
||||||
"is_memory_intensive": False,
|
# Not memory intensive, but run at the end
|
||||||
|
"is_memory_intensive": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "census_acs_2010",
|
"name": "census_acs_2010",
|
||||||
"module_dir": "census_acs_2010",
|
"module_dir": "census_acs_2010",
|
||||||
"class_name": "CensusACS2010ETL",
|
"class_name": "CensusACS2010ETL",
|
||||||
"is_memory_intensive": False,
|
# Not memory intensive, but run at the end
|
||||||
|
"is_memory_intensive": True,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "us_army_fuds",
|
"name": "us_army_fuds",
|
||||||
|
|
Loading…
Add table
Reference in a new issue