From 27f84b84061b434e3734e397fe6ae4fba4bb6a4a Mon Sep 17 00:00:00 2001 From: ChrisRibe Date: Thu, 20 Apr 2023 23:13:45 -0400 Subject: [PATCH] Fixed YAML var usages --- .github/workflows/publish_docs_to_wiki.yml | 21 ++++++++------------- doc/How to build - Windows.md | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish_docs_to_wiki.yml b/.github/workflows/publish_docs_to_wiki.yml index 9a5fa3c85..1fd97e93f 100644 --- a/.github/workflows/publish_docs_to_wiki.yml +++ b/.github/workflows/publish_docs_to_wiki.yml @@ -1,6 +1,6 @@ name: Publish docs to Wiki -# Trigger this action only if there are changes pushed to the docs/** directory under the main branch +# Trigger this action only if there are changes pushed to the doc/** directory under the main branch on: push: paths: @@ -11,7 +11,7 @@ on: env: USER_TOKEN: ${{ secrets.WIKI_ACTION_TOKEN }} # This is the repository secret USER_NAME: 'stupid-deploy-bot' # Enter the username of your (bot) account - USER_EMAIL: '76802126+stupid-deploy-bot@users.noreply.github.com' # Enter the e-mail of your (bot) account + USER_EMAIL: 'stupid-deploy-bot@users.noreply.github.com' # Enter the e-mail of your (bot) account OWNER: ${{ github.event.repository.owner.name }} # This is the repository owner REPOSITORY_NAME: ${{ github.event.repository.name }} # This is the repository name @@ -23,23 +23,18 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - # 1. Create folder named `tmp_wiki` - # 2. Initialize Git - # 3. Pull old Wiki content + # 1. Clone the current wiki master branch to a folder named `tmp_wiki` - name: Pull content from wiki run: | - mkdir tmp_wiki - cd tmp_wiki - git init - git config user.name $USER_NAME - git config user.email $USER_EMAIL - git pull https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git + git config --global user.name "$USER_NAME" + git config --global user.email "$USER_EMAIL" + git clone https://"$USER_TOKEN"@github.com/"$OWNER"/"$REPOSITORY_NAME".wiki.git tmp_wiki # 4. Synchronize differences between `doc` & `tmp_wiki` # 5. Push new Wiki content - - name: Push content to wiki + - name: Push main repo content to wiki run: | rsync -av --delete doc/ tmp_wiki/ --exclude .git cd tmp_wiki git add . git commit -m "Updated Wiki content" - git push -f --set-upstream https://$USER_TOKEN@github.com/$OWNER/$REPOSITORY_NAME.wiki.git master \ No newline at end of file + git push origin master diff --git a/doc/How to build - Windows.md b/doc/How to build - Windows.md index 08cbc8c71..cfac39563 100644 --- a/doc/How to build - Windows.md +++ b/doc/How to build - Windows.md @@ -32,4 +32,4 @@ then build it using command or building it under the Visual Studio 2019 (set the OrcaSlicer_app_gui as start project) -![image](https://user-images.githubusercontent.com/106916061/179185940-06135b47-f2a4-415a-9be4-666680fa0f9a.png) +![image](https://user-images.githubusercontent.com/106916061/179185940-06135b47-f2a4-415a-9be4-666680fa0f9a.png) \ No newline at end of file