Skip to content

Commit bd6c2d4

Browse files
committed
chore: update workflow
1 parent b06f715 commit bd6c2d4

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

.github/workflows/update-nightly.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,19 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
build:
9+
update:
1010
runs-on: ubuntu-latest
1111
steps:
1212

1313
- name: checkout
1414
uses: actions/checkout@v6
1515
with:
1616
ref: nightly-testing
17-
fetch-depth: 0
1817
token: ${{ secrets.UNICODE_BASIC_TOKEN }}
1918

20-
2119
- name: install jq
2220
uses: dcarbone/install-jq-action@v3
2321

24-
2522
- name: set user
2623
run: |
2724
git config user.name "${{ github.actor }}"
@@ -30,7 +27,7 @@ jobs:
3027
- name: merge main
3128
run: |
3229
git fetch origin
33-
git merge main --strategy-option ours --no-commit --allow-unrelated-histories
30+
git merge origin/main --strategy-option ours --no-commit --allow-unrelated-histories
3431
3532
- name: update lean-toolchain
3633
id: toolchain-tag

0 commit comments

Comments
 (0)