Skip to content

Commit 04c2dd7

Browse files
authored
Update update-blog-dashboard-test.yml
1 parent 49ec79a commit 04c2dd7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/update-blog-dashboard-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,15 @@ jobs:
2222
- name: Clone the blog repo (shallow clone)
2323
run: git clone --depth 1 https://github.com/sadmanca/blog blog-repo
2424

25+
- name: Pull latest changes from remote
26+
run: |
27+
cd blog-repo
28+
git pull origin pey-2024-test || echo "No changes to pull or merge conflict occurred."
29+
2530
- name: Checkout pey-2024-test branch in blog repo
2631
run: |
2732
cd blog-repo
28-
git checkout -B pey-2024-test
33+
git checkout -b pey-2024-test
2934
3035
- name: Set up Python
3136
uses: actions/setup-python@v4
@@ -63,11 +68,6 @@ jobs:
6368
cd blog-repo
6469
git remote set-url origin https://x-access-token:${{ secrets.GH_BLOG_TOKEN }}@github.com/sadmanca/blog.git
6570
66-
- name: Pull latest changes from remote
67-
run: |
68-
cd blog-repo
69-
git pull origin pey-2024-test --rebase || echo "No changes to pull or merge conflict occurred."
70-
7171
- name: Push changes to the blog repo
7272
run: |
7373
cd blog-repo

0 commit comments

Comments
 (0)