Skip to content

Commit

Permalink
Merge branch 'main' into zlw-sample-diff
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeLonewolf authored Dec 13, 2023
2 parents 390b87f + 8453a8d commit 39c31b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
checks: write
concurrency: preview-${{ github.ref }}
jobs:
deploy-preview:
build-preview:
runs-on: ubuntu-latest
steps:
- name: Use Node.js 18.x
Expand Down Expand Up @@ -66,6 +66,7 @@ jobs:
until nc -z localhost 1776; do sleep 1; done
working-directory: main
- name: Capture main branch sample clips
# Run PR branch scripts against server running from main branch
id: main-samples
run: |
npm run generate_samples
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/s3-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Set up AWS CLI
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down

0 comments on commit 39c31b2

Please sign in to comment.