One more attempt to fix merging to main, it appears it doesn't like curly brackets (#277)

This commit is contained in:
Nat Hillard 2021-06-30 18:58:54 -04:00 committed by GitHub
parent 8f3c7487fc
commit 00fd51de8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -30,11 +30,11 @@ jobs:
# If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main" # If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main"
# This variable is used by gatsby-config.js to set a prefixPath # This variable is used by gatsby-config.js to set a prefixPath
- name: Set DESTINATION_FOLDER for main - name: Set DESTINATION_FOLDER for main
if: ${{ github.event.pull_request.merged == true }} if: github.event.pull_request.merged == true
run: | run: |
echo "DESTINATION_FOLDER=main" >> $GITHUB_ENV echo "DESTINATION_FOLDER=main" >> $GITHUB_ENV
- name: Set DESTINATION_FOLDER for branch - name: Set DESTINATION_FOLDER for branch
if: ${{ github.event.pull_request.merged != true }} if: github.event.pull_request.merged != true
run: | run: |
echo "DESTINATION_FOLDER=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV echo "DESTINATION_FOLDER=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
- name: Install - name: Install
@ -72,11 +72,11 @@ jobs:
path: ./public path: ./public
# If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main" # If this is just a PR branch, put content in a hash directory. Otherwise, put it in "main"
- name: Set DESTINATION_FOLDER for main - name: Set DESTINATION_FOLDER for main
if: ${{ github.event.pull_request.merged == true }} if: github.event.pull_request.merged == true
run: | run: |
echo "DESTINATION_FOLDER=main" >> $GITHUB_ENV echo "DESTINATION_FOLDER=main" >> $GITHUB_ENV
- name: Set DESTINATION_FOLDER for branch - name: Set DESTINATION_FOLDER for branch
if: ${{ github.event.pull_request.merged != true }} if: github.event.pull_request.merged != true
run: | run: |
echo "DESTINATION_FOLDER=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV echo "DESTINATION_FOLDER=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
- name: Deploy to Github Pages - name: Deploy to Github Pages