Skip to content

Commit a65da4b

Browse files
authored
Attempt 2 at fixing website pipeline
1 parent 4361dcd commit a65da4b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/publish-site.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ jobs:
2121
- name: Checkout Website Branch
2222
run: |
2323
git fetch --all
24-
git checkout ci/github-pages
2524
git config --local user.email "[email protected]"
2625
git config --local user.name "The Silk.NET Automaton"
27-
git merge --allow-unrelated-histories -X theirs main
28-
git pull --recurse-submodules
26+
git merge --allow-unrelated-histories -s ours origin/ci/github-pages
27+
git checkout ci/github-pages
28+
git reset --hard main
29+
git submodule init
2930
- name: Run Statiq
3031
run: dotnet run -c Release --project src/Website/Silk.NET.Statiq/Silk.NET.Statiq.csproj -- -l debug --nocache
3132
- name: Push to Website Branch

0 commit comments

Comments
 (0)