From de8494939c7adb7cd64e853630d04db02e84d052 Mon Sep 17 00:00:00 2001 From: John Seekins Date: Thu, 12 Jan 2023 12:36:50 -0700 Subject: [PATCH 1/3] extract geo database along with other backups Signed-off-by: John Seekins --- docker/cron/backup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/cron/backup.sh b/docker/cron/backup.sh index 71929120..2e38e758 100755 --- a/docker/cron/backup.sh +++ b/docker/cron/backup.sh @@ -19,6 +19,7 @@ aws s3 cp openstatesorg.pgdump "s3://openstates-backups/full-backup/$(date +%Y-% rm -f openstatesorg.pgdump + # layered approach for public echo "Executing public schema-only backup..." pg_dump -Fc openstatesorg --schema-only > schema.pgdump @@ -35,3 +36,9 @@ pg_dump -Fc openstatesorg --data-only \ echo "Uploading public backups to s3..." aws s3 cp --acl public-read public.pgdump "s3://data.openstates.org/postgres/daily/$(date +%Y-%m-%d)-public.pgdump" > /dev/null aws s3 cp --acl public-read public.pgdump "s3://data.openstates.org/postgres/monthly/$(date +%Y-%m)-public.pgdump" > /dev/null + +echo "Extracting geo backup..." +pg_dump -Fc geo > openstates-geo.pgdump +echo "Shipping full backup to s3" +aws s3 cp openstates-geo.pgdump "s3://data.openstates.org/postgres/geo/$(date +%Y-%m-%d)-openstates-geo.pgdump" > /dev/null +rm -f openstates-geo.pgdump From 6c9012143c19a776b5d74e2e7fe4f58bf323b415 Mon Sep 17 00:00:00 2001 From: John Seekins Date: Thu, 12 Jan 2023 13:15:00 -0700 Subject: [PATCH 2/3] actually backup geo database Signed-off-by: John Seekins --- docker/cron/backup.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/cron/backup.sh b/docker/cron/backup.sh index 2e38e758..f27778e6 100755 --- a/docker/cron/backup.sh +++ b/docker/cron/backup.sh @@ -18,7 +18,11 @@ echo "Shipping full backup to s3" aws s3 cp openstatesorg.pgdump "s3://openstates-backups/full-backup/$(date +%Y-%m-%d)-openstatesorg.pgdump" > /dev/null rm -f openstatesorg.pgdump - +echo "Extracting geo backup..." +pg_dump -Fc geo > openstates-geo.pgdump +echo "Shipping full backup to s3" +aws s3 cp openstates-geo.pgdump "s3://openstates-backups/full-backup/$(date +%Y-%m-%d)-openstates-geo.pgdump" > /dev/null +rm -f openstates-geo.pgdump # layered approach for public echo "Executing public schema-only backup..." @@ -36,9 +40,3 @@ pg_dump -Fc openstatesorg --data-only \ echo "Uploading public backups to s3..." aws s3 cp --acl public-read public.pgdump "s3://data.openstates.org/postgres/daily/$(date +%Y-%m-%d)-public.pgdump" > /dev/null aws s3 cp --acl public-read public.pgdump "s3://data.openstates.org/postgres/monthly/$(date +%Y-%m)-public.pgdump" > /dev/null - -echo "Extracting geo backup..." -pg_dump -Fc geo > openstates-geo.pgdump -echo "Shipping full backup to s3" -aws s3 cp openstates-geo.pgdump "s3://data.openstates.org/postgres/geo/$(date +%Y-%m-%d)-openstates-geo.pgdump" > /dev/null -rm -f openstates-geo.pgdump From 28b225fae0977158f352ed465d9bf2d7f7408aa1 Mon Sep 17 00:00:00 2001 From: John Seekins Date: Thu, 12 Jan 2023 14:40:53 -0700 Subject: [PATCH 3/3] bump action steps to fix some bugs Signed-off-by: John Seekins --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af93a70d..3b79ba32 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,16 +30,16 @@ jobs: - 5432:5432 steps: - name: check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Python dependencies - name: setup Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 - name: install Poetry - uses: snok/install-poetry@v1.1.1 + uses: snok/install-poetry@v1.3.3 - name: cache Poetry virtualenv - uses: actions/cache@v2 + uses: actions/cache@v3 id: poetry-cache with: path: ~/.virtualenvs/ @@ -60,7 +60,7 @@ jobs: with: node-version: '12' - name: cache node_modules - uses: actions/cache@v2 + uses: actions/cache@v3 id: node-cache with: path: ./node_modules