Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

Update Workflow's with newer versions of Postgres, Ubuntu, and Checkout action #440

Merged
merged 9 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/input_cama.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 📁 CAMA Processing
name: 📁 CAMA Processing (Input data for PLUTO)

on:
workflow_dispatch:
Expand All @@ -7,10 +7,10 @@ on:

jobs:
process_cama:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgis/postgis:12-3.0-alpine
image: postgis/postgis:15-3.3-alpine
env:
POSTGRES_PASSWORD: postgres
options: >-
Expand All @@ -30,7 +30,7 @@ jobs:
GINGER_USER: ${{ secrets.GINGER_USER }}
GINGER_HOST: ${{ secrets.GINGER_HOST }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install ssh key
run: |
mkdir -p ~/.ssh/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/input_numbldgs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 📁 NumBldgs processing
name: 📁 Number of Buildings Processing (input data for PLUTO)

on:
schedule:
Expand All @@ -7,15 +7,15 @@ on:

jobs:
process_numbldgs:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
AWS_S3_ENDPOINT: ${{ secrets.DO_S3_ENDPOINT }}
AWS_ACCESS_KEY_ID: ${{ secrets.DO_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.DO_SECRET_ACCESS_KEY }}
AWS_S3_BUCKET: edm-recipes
API_TOKEN: ${{ secrets.API_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: install minio ..
run: |
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/input_pts.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: 📁 PTS processing
name: 📁 Property Tax System (PTS) processing (input data for PLUTO)
on:
push:
branches:
- main
- pts/**
paths:
paths:
- pluto_build/python/geocode.py
- pluto_build/bin/pts.sh
- pluto_build/sql/_load_pts.sql
Expand All @@ -17,14 +17,15 @@ jobs:
runs-on: ubuntu-20.04
services:
postgres:
image: postgis/postgis:12-3.0-alpine
image: postgis/postgis:15-3.3-alpine
env:
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
--shm-size=2gb
ports:
- 5432:5432
env:
Expand All @@ -37,7 +38,7 @@ jobs:
GINGER_USER: ${{ secrets.GINGER_USER }}
GINGER_HOST: ${{ secrets.GINGER_HOST }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: install ssh key
run: |
mkdir -p ~/.ssh/
Expand All @@ -54,7 +55,7 @@ jobs:
- name: process pts
working-directory: pluto_build
run: ./pluto import pts

- uses: NYCPlanning/[email protected]
id: pluto_pts
with:
Expand All @@ -68,7 +69,7 @@ jobs:
- name: geocode pts
working-directory: pluto_build
run: ./pluto geocode pts

- uses: NYCPlanning/[email protected]
id: pluto_input_geocodes
with:
Expand All @@ -78,7 +79,7 @@ jobs:
latest: true
compress: true
output_format: pgdump csv

- name: clean up pts
shell: bash
working-directory: pluto_build
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/issue-comment-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
github.event.comment.user.login == 'AmandaDoyle' ||
github.event.comment.user.login == 'td928'
)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgis/postgis:12-3.0-alpine
image: postgis/postgis:15-3.3-alpine
env:
POSTGRES_PASSWORD: postgres
options: >-
Expand All @@ -37,7 +37,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: install dependencies
working-directory: pluto_build
Expand All @@ -51,22 +51,22 @@ jobs:
working-directory: pluto_build
shell: bash
run: ./01_dataloading.sh

- name: building ...
working-directory: pluto_build
shell: bash
run: ./02_build.sh

- name: applying corrections ...
shell: bash
working-directory: pluto_build
run: ./03_corrections.sh

- name: archiving ...
shell: bash
working-directory: pluto_build
run: ./04_archive.sh

- name: Creating QAQC tables ...
shell: bash
working-directory: pluto_build
Expand All @@ -77,7 +77,7 @@ jobs:
shell: bash
run: |
./06_export.sh
- name: create report
id: report
shell: bash
Expand All @@ -88,22 +88,22 @@ jobs:
report="${report//$'\n'/'%0A'}"
report="${report//$'\r'/'%0D'}"
echo ::set-output name=report::$report
- name: report results in comment
if: success()
uses: peter-evans/create-or-update-comment@v1
with:
comment-id: ${{ github.event.comment.id }}
body: |
## PLUTO Build Complete!
<summary> Source Info </summary>
<details>
${{ steps.report.outputs.report }}
</details>
for more details, check https://github.com/NYCPlanning/db-pluto/actions/runs/${{ github.run_id }}
reactions: hooray
18 changes: 9 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ on:
jobs:
version:
name: get version
runs-on: ubuntu-20.04
outputs:
runs-on: ubuntu-22.04
outputs:
version: ${{ steps.version.outputs.version }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get Version
id: version
run: |
source pluto_build/version.env
echo "::set-output name=version::$VERSION"
echo "Version is $VERSION"
publish:
needs: [version]
name: publishing
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
AWS_S3_ENDPOINT: ${{ secrets.DO_S3_ENDPOINT }}
AWS_ACCESS_KEY_ID: ${{ secrets.DO_ACCESS_KEY_ID }}
Expand All @@ -39,7 +39,7 @@ jobs:
- dcp_mappluto_clipped
# - pluto_corrections
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: NYCPlanning/[email protected]
# if: matrix.dataset != 'pluto_corrections'
with:
Expand All @@ -49,7 +49,7 @@ jobs:
compress: true
output_format: pgdump csv shapefile
version: ${{ needs.version.outputs.version }}

- uses: NYCPlanning/[email protected]
# if: matrix.dataset == 'pluto_corrections'
with:
Expand All @@ -67,8 +67,8 @@ jobs:
project_id: ${{ secrets.GCP_PROJECT_ID_DATA_ENGINEERING }}
service_account_key: ${{ secrets.GCP_GCS_BQ_SA_KEY }}
export_default_credentials: true

- name: Upload to BigQuery
if: matrix.dataset == 'dcp_mappluto'
working-directory: pluto_build
run: ./pluto bq publish dcp_mappluto
run: ./pluto bq publish dcp_mappluto
16 changes: 8 additions & 8 deletions .github/workflows/publish_historical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ on:
version:
description: version name of the release
required: false
default: '02b'
default: "02b"
library:
description: run data library load process?
required: false
default: 'yes'
default: "yes"
bq:
description: run bq load process?
required: false
default: 'yes'
default: "yes"
jobs:
library:
name: load to data library
if: github.event.inputs.library == 'yes'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
AWS_S3_ENDPOINT: ${{ secrets.DO_S3_ENDPOINT }}
AWS_ACCESS_KEY_ID: ${{ secrets.DO_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.DO_SECRET_ACCESS_KEY }}
AWS_S3_BUCKET: edm-recipes
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: NYCPlanning/[email protected]
if: github.event.inputs.library == 'yes'
with:
Expand All @@ -38,17 +38,17 @@ jobs:
bq:
name: load to bigquery
needs: library
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
if: always() && github.event.inputs.bq == 'yes'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@master
with:
project_id: ${{ secrets.GCP_PROJECT_ID_DATA_ENGINEERING }}
service_account_key: ${{ secrets.GCP_GCS_BQ_SA_KEY }}
export_default_credentials: true

- name: Upload to BigQuery
working-directory: pluto_build
run: ./pluto bq publish_historical dcp_mappluto ${{ github.event.inputs.version }}
7 changes: 4 additions & 3 deletions .github/workflows/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ on:
default: false
jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
services:
postgres:
image: postgis/postgis:12-3.0-alpine
image: postgis/postgis:15-3.3-alpine
env:
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
--shm-size=2gb
ports:
- 5432:5432
env:
Expand All @@ -35,7 +36,7 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: install dependencies
working-directory: pluto_build
Expand Down
7 changes: 5 additions & 2 deletions pluto_build/templates/pluto_input_cama_dof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ dataset:

info:
description: |
### CAMA
### CAMA - DOF uses the Computer-Assisted Mass Appraisal System (CAMA) for property
tax valuations. Assessors determine parcel market value using one of several valuation
methods based on the parcels tax class. Once market value is determined, the assessed
value is a percentage calculation of the market value.
url: null
dependents: []
dependents: []