Skip to content

Commit

Permalink
Merge pull request #12 from dc7devs/main
Browse files Browse the repository at this point in the history
chore(git): merge `main` into `dev`
  • Loading branch information
dc7devs authored May 13, 2024
2 parents 93f9a2f + 948bdf9 commit 3cf1935
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/sync-dev-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
id: pull
uses: tretuna/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.WORKFLOW }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FROM_BRANCH: "main"
TO_BRANCH: "dev"
PULL_REQUEST_TITLE: "chore(git): merge `main` into `dev`"
Expand All @@ -41,6 +41,6 @@ jobs:
uses: actions/checkout@v4
- name: Add "automerge" label
env:
GITHUB_TOKEN: ${{ secrets.WORKFLOW }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PULL_REQUEST_NUMBER: ${{needs.create-sync-pr.outputs.PULL_REQUEST_NUMBER}}
run: gh pr edit $PULL_REQUEST_NUMBER --add-label automerge
7 changes: 7 additions & 0 deletions app/article/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default function ArticlePage() {
return (
<div>
<h1>Article Page</h1>
</div>
);
}

0 comments on commit 3cf1935

Please sign in to comment.