mirror of
https://github.com/kremalicious/portfolio.git
synced 2024-12-22 09:13:19 +01:00
master → main
This commit is contained in:
parent
6d1c3cce53
commit
f632556178
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@ -68,14 +68,14 @@ jobs:
|
||||
GATSBY_GITHUB_TOKEN: ${{ secrets.GATSBY_GITHUB_TOKEN }}
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
|
||||
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/main'
|
||||
with:
|
||||
name: public
|
||||
path: public
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
if: success() && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
|
||||
if: success() && (github.event_name == 'pull_request' || github.ref == 'refs/heads/main')
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
@ -105,7 +105,7 @@ jobs:
|
||||
temporaryPublicStorage: 'true'
|
||||
|
||||
- name: Audit Live using Lighthouse
|
||||
if: success() && github.ref == 'refs/heads/master'
|
||||
if: success() && github.ref == 'refs/heads/main'
|
||||
uses: treosh/lighthouse-ci-action@v2
|
||||
with:
|
||||
urls: 'https://matthiaskretschmann.com'
|
||||
|
@ -219,7 +219,7 @@ SLUG-03.png
|
||||
|
||||
Automatic deployments are triggered upon successful tests & builds via GitHub Actions:
|
||||
|
||||
- push to `master` initiates a live deployment
|
||||
- push to `main` initiates a live deployment
|
||||
- any Pull Request, and subsequent pushes to it, initiates a beta deployment
|
||||
|
||||
The deploy command simply calls the [`scripts/deploy.sh`](scripts/deploy.sh) script, syncing the contents of the `public/` folder to S3:
|
||||
|
@ -61,16 +61,16 @@ function ping {
|
||||
}
|
||||
|
||||
##
|
||||
## check for pull request against master
|
||||
## check for pull request against main
|
||||
##
|
||||
if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
|
||||
|
||||
s3sync $AWS_S3_BUCKET_BETA
|
||||
|
||||
##
|
||||
## check for master push which is no pull request
|
||||
## check for main push which is no pull request
|
||||
##
|
||||
elif [ "$GITHUB_REF" == "refs/heads/master" ]; then
|
||||
elif [ "$GITHUB_REF" == "refs/heads/main" ]; then
|
||||
|
||||
s3sync $AWS_S3_BUCKET
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user