Adding SHA (for PRs)/ Main (for main) to URL (#121)

* Fixes #90 - adds a GHA SHA to PR branches and 'main' for merges to main
This commit is contained in:
Nat Hillard 2021-06-14 10:42:09 -04:00 committed by GitHub
parent 7ab14c7f3d
commit 9ea0f946eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions

View file

@ -27,6 +27,11 @@ jobs:
uses: actions/setup-node@v2 uses: actions/setup-node@v2
with: with:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- name: Set GITHUB_SHA_SHORT
run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
# If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main"
- name: Set DESTINATION_FOLDER
run: echo "DESTINATION_FOLDER=${{ github.event.pull_request.merged == 'true' && 'main' || env.GITHUB_SHA_SHORT }}" >> $GITHUB_ENV
- name: Install - name: Install
run: npm ci run: npm ci
- name: Build - name: Build
@ -59,12 +64,18 @@ jobs:
with: with:
name: J40Static name: J40Static
path: ./public path: ./public
- name: Set GITHUB_SHA_SHORT
run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
# If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main"
- name: Set DESTINATION_FOLDER
run: echo "DESTINATION_FOLDER=${{ github.event.pull_request.merged == 'true' && 'main' || env.GITHUB_SHA_SHORT }}" >> $GITHUB_ENV
- name: Deploy to Github Pages - name: Deploy to Github Pages
uses: JamesIves/github-pages-deploy-action@4.1.0 uses: JamesIves/github-pages-deploy-action@4.1.0
with: with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to. BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: public # The folder the action should deploy. FOLDER: public # The folder the action should deploy.
TARGET-FOLDER: ${{env.DESTINATION_FOLDER}} # If we're on a PR branch, merge to PR folder
- name: Configure AWS Credentials - name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1 uses: aws-actions/configure-aws-credentials@v1
with: with:
@ -72,4 +83,4 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1 aws-region: us-east-1
- name: Deploy to Geoplatform AWS - name: Deploy to Geoplatform AWS
run: aws s3 sync ./public/ s3://usds-geoplatform-justice40-website/justice40-tool --delete run: aws s3 sync ./public/ s3://usds-geoplatform-justice40-website/justice40-tool/${{env.DESTINATION_FOLDER}} --delete

View file

@ -2,7 +2,7 @@ module.exports = {
siteMetadata: { siteMetadata: {
title: 'Justice40', title: 'Justice40',
}, },
pathPrefix: '/justice40-tool', pathPrefix: `/justice40-tool/${process.env.DESTINATION_FOLDER}`,
plugins: [ plugins: [
{ {
resolve: 'gatsby-plugin-sass', resolve: 'gatsby-plugin-sass',