Skip to content

Commit

Permalink
Merge branch 'dev' into animations
Browse files Browse the repository at this point in the history
  • Loading branch information
Ushie committed Sep 7, 2024
2 parents f9765ad + 7787ecd commit 7a4d534
Show file tree
Hide file tree
Showing 39 changed files with 6,586 additions and 1,940 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
name: Deploy

on: [pull_request, push]

on:
workflow_dispatch:
push:
branches:
- main
- dev
pull_request:
branches:
- dev
jobs:
deploy:
runs-on: ubuntu-latest
Expand All @@ -24,7 +31,7 @@ jobs:
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: ${{ secrets.CLOUDFLARE_PROJECT_NAME }}
projectName: ${{ vars.CLOUDFLARE_PROJECT_NAME }}
directory: public
id: publish

Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/open_pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Open a PR to main

on:
push:
branches:
- dev
workflow_dispatch:

env:
MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`

jobs:
pull-request:
name: Open pull request
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Open pull request
uses: repo-sync/pull-request@v2
with:
destination_branch: 'main'
pr_title: 'chore: ${{ env.MESSAGE }}'
pr_body: 'This pull request will ${{ env.MESSAGE }}.'
pr_draft: true
Loading

0 comments on commit 7a4d534

Please sign in to comment.