From a1fb5beed9c31c35555b56692a9f5dc83f0407e5 Mon Sep 17 00:00:00 2001 From: James Hodgkinson Date: Wed, 22 May 2024 16:12:26 +1000 Subject: [PATCH] Fixing up the docs deploy script (#2787) * fixing up the deploy script * updating issue templates * poor clippy --- .github/ISSUE_TEMPLATE/an-idea-or-question.md | 8 ++++---- .github/ISSUE_TEMPLATE/bug_report.md | 2 ++ .github/workflows/clippy.yml | 3 ++- .github/workflows/kanidm_book.yml | 7 ++----- .gitignore | 5 ++++- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/an-idea-or-question.md b/.github/ISSUE_TEMPLATE/an-idea-or-question.md index 12af7bea1..973de3440 100644 --- a/.github/ISSUE_TEMPLATE/an-idea-or-question.md +++ b/.github/ISSUE_TEMPLATE/an-idea-or-question.md @@ -7,18 +7,18 @@ assignees: '' --- -**Is your feature request related to a problem? Please describe.** +### Is your feature request related to a problem? Please describe A clear description of what the problem is. Ex. I'm confused by, or would like to know how to... -**Describe the solution you'd like** +### Describe the solution you'd like A description of what you'd expect to happen. -**Describe alternatives you've considered** +### Describe alternatives you've considered Are there any alternative solutions or features you've considered. -**Additional context** +### Additional context Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9f73e14e5..7d5a4b7f4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,6 +11,8 @@ assignees: '' ### I expected the following +### This happened instead + ### Kanidm version details - Output of `kanidm(d) version`: diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index e1806ee7b..56e589033 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -32,7 +32,8 @@ jobs: libudev-dev \ libssl-dev \ pkg-config \ - tpm-udev + tpm-udev \ + libtss2-dev - name: "Run clippy (ignores errors, this is just a check)" run: cargo clippy --all-features --all-targets diff --git a/.github/workflows/kanidm_book.yml b/.github/workflows/kanidm_book.yml index 21f7d56fd..130b62262 100644 --- a/.github/workflows/kanidm_book.yml +++ b/.github/workflows/kanidm_book.yml @@ -104,7 +104,7 @@ jobs: path: ./docs/ env: ACTIONS_RUNNER_DEBUG: true - - name: Download stble artifact + - name: Download stable artifact uses: actions/download-artifact@v4 with: name: "individual${{ needs.pre_deploy.outputs.latest }}" @@ -120,10 +120,7 @@ jobs: find $(pwd) -name '*.tar.gz' -ls -exec tar zxvf "{}" \; echo "Carrying on..." mkdir -p docs - cd docs && cp -R "$(git branch -a \ - | awk '{print $1}' \ - | sort -t. -k3n,3 -k4n,4 \ - | awk -F'/' '{print $NF}' | tail -n1)/" stable && cd .. + cd docs && cp -R "${{ needs.pre_deploy.outputs.latest}}" stable && cd .. ls -la docs/ echo "Cleaning up docs archives" rm docs/*.tar.gz diff --git a/.gitignore b/.gitignore index 9f3789e3f..425b53396 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ vendor.tar.* *.patch tools/orca/example_profiles/small/orca-edited.toml /docs/ -.vscode/ # webui things we don't need *.d.ts @@ -39,3 +38,7 @@ scripts/oauth_proxy/client.secret scripts/oauth_proxy/envfile # local config things .envrc + +# IDEs +.idea/ +.vscode/