From baa8270c423a70fc1c2b403adfb4b5e65533cc4e Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 14:58:46 -0500 Subject: [PATCH 1/6] Update action.yml --- action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index ef1c431..c0ca772 100644 --- a/action.yml +++ b/action.yml @@ -20,9 +20,9 @@ inputs: default: ${{ github.token }} path: description: >- - The directory to use for your wiki contents. Default .github/wiki. + The directory to use for your wiki contents. Default is root "wiki" folder. required: true - default: .github/wiki + default: wiki commit-message: description: >- The message to use when committing new content. Default is Update wiki From 30441c7ec9e46cf025260014e1e24642b01cf125 Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 15:04:10 -0500 Subject: [PATCH 2/6] move test folder to new spot --- {.github/wiki => wiki}/Home.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.github/wiki => wiki}/Home.md (100%) diff --git a/.github/wiki/Home.md b/wiki/Home.md similarity index 100% rename from .github/wiki/Home.md rename to wiki/Home.md From 3b2fdd150852502b64cc6dd0613ac8433dae597e Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 15:05:12 -0500 Subject: [PATCH 3/6] Change readme text to match (slight variation) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 45bdebd..23961ff 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,7 @@ one of your GitHub Actions workflows. - **`token`:** `${{ github.token }}` is the default. This token is used when cloning and pushing wiki changes. -- **`path`:** The directory to use for your wiki contents. Default: - `.github/wiki`. +- **`path`:** The directory to use for your wiki contents. Default is root `wiki/` folder. - **`commit-message`:** The message to use when committing new content. Default is `Update wiki ${{ github.sha }}`. You probably don't need to change this, From e9536368e5adeed951ff4f5d90d0a12dc202609b Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 15:06:36 -0500 Subject: [PATCH 4/6] Change demo to use non-default --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 23961ff..f0d2691 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ jobs: - uses: spenserblack/actions-wiki@v0.1.1 with: # Whatever directory you choose will be mirrored to the GitHub - # .wiki.git. The default is .github/wiki. - path: wiki + # github.com/user/repo.wiki.git. The default is the root wiki/ folder. + path: docs/wiki # For now, you'll need to manually specify a GitHub token until we # solve #2. The x: prefix is a dummy username. token: x:${{ secrets.GITHUB_TOKEN }} From 0300b848ac2b54b35327badd88c5543f43006176 Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 15:08:10 -0500 Subject: [PATCH 5/6] prettier --- README.md | 3 ++- action.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f0d2691..58b99e5 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,8 @@ one of your GitHub Actions workflows. - **`token`:** `${{ github.token }}` is the default. This token is used when cloning and pushing wiki changes. -- **`path`:** The directory to use for your wiki contents. Default is root `wiki/` folder. +- **`path`:** The directory to use for your wiki contents. Default is root + `wiki/` folder. - **`commit-message`:** The message to use when committing new content. Default is `Update wiki ${{ github.sha }}`. You probably don't need to change this, diff --git a/action.yml b/action.yml index c0ca772..08da764 100644 --- a/action.yml +++ b/action.yml @@ -20,7 +20,8 @@ inputs: default: ${{ github.token }} path: description: >- - The directory to use for your wiki contents. Default is root "wiki" folder. + The directory to use for your wiki contents. Default is root "wiki" + folder. required: true default: wiki commit-message: From c34573dfdb417c7ace92d778171b6fd3fa1daa0a Mon Sep 17 00:00:00 2001 From: Jacob Hummer Date: Thu, 13 Apr 2023 15:09:15 -0500 Subject: [PATCH 6/6] align with new wiki folder the dir didn't exist that's why it kept failing before --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fd34ff..2cdcdef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Write Rev - run: 'git log -1 --format="%H" > .github/wiki/Rev.md' + run: 'git log -1 --format="%H" > wiki/Rev.md' - uses: ./ with: # For now, you'll need to manually specify a GitHub token until we