Skip to content

Commit

Permalink
Merge pull request #21 from CityOfLosAngeles/development
Browse files Browse the repository at this point in the history
major data update
  • Loading branch information
angelamhkim authored Nov 25, 2021
2 parents bf9f853 + af9f4b6 commit 723c3f1
Show file tree
Hide file tree
Showing 6 changed files with 4,807 additions and 9 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/BuildNDeployDev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow will checkout the contents of the `S3Dev` branch of this repo, remove all files in the current S3 bucket, and push the contents
# This workflow will checkout the contents of the `development` branch of this repo, remove all files in the current S3 bucket, and push the contents
# to the bucket. Once the contents of the S3 bucket has been updated, a call will be made to invalidate the cache in the CloudFront distribution.
# The CloudFront distribution is configured to pull the contents from the S3 bucket once an `invalidation` request is sent.

Expand All @@ -8,7 +8,8 @@ on: # run this workflow when a push has been made to `development` branch
push:
branches:
- development

repository_dispatch: # Listen for repository dispatch event from open-sdg-data-starter workflow
types: [dev_triggered_from_open-sdg-data-starter]

jobs:
deploy:
Expand All @@ -19,6 +20,8 @@ jobs:
###########################################################################################################
- name: Checkout repo
uses: actions/checkout@v2
with:
ref: development

- name: Setup Ruby
uses: actions/setup-ruby@v1
Expand Down Expand Up @@ -75,4 +78,4 @@ jobs:
run: aws cloudfront create-invalidation --distribution-id ${{ secrets.CDN_DISTRIBUTION_ID_DEV }} --paths "/*"




6 changes: 5 additions & 1 deletion .github/workflows/BuildNDeployProd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This workflow will checkout the contents of the `S3Dev` branch of this repo, remove all files in the current S3 bucket, and push the contents
# This workflow will checkout the contents of the `production` branch of this repo, remove all files in the current S3 bucket, and push the contents
# to the bucket. Once the contents of the S3 bucket has been updated, a call will be made to invalidate the cache in the CloudFront distribution.
# The CloudFront distribution is configured to pull the contents from the S3 bucket once an `invalidation` request is sent.

Expand All @@ -8,6 +8,8 @@ on: # run this workflow when a push has been made to `Jekyll-Alf` branch
push:
branches:
- production
repository_dispatch: # Listen for repository dispatch event from open-sdg-data-starter workflow
types: [prod_triggered_from_open-sdg-data-starter]


jobs:
Expand All @@ -19,6 +21,8 @@ jobs:
###########################################################################################################
- name: Checkout repo
uses: actions/checkout@v2
with:
ref: production

- name: Setup Ruby
uses: actions/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ data_dir: data
# environment must be set to staging to toggle the edit buttions for prose.io
environment: staging
# Replace MY-GITHUB-ORG and OPEN-SDG-DATA-STARTER as needed.
remote_data_prefix: "https://d26ib27epzwu9e.cloudfront.net"
remote_data_prefix: "https://sdgdatabase-dev.itacloudops.org"
remote_translations:
- https://open-sdg.github.io/sdg-translations/translations-0.8.1.json

Expand Down
Loading

0 comments on commit 723c3f1

Please sign in to comment.