From c41f2451d7a3c05789324685b95ff6b9d167e8ea Mon Sep 17 00:00:00 2001 From: Rike-Benjamin Schuppner Date: Mon, 16 Oct 2023 23:36:17 +0200 Subject: [PATCH 1/2] BF: For some reason `git shortlog` needs a `HEAD` argument. --- build-docs.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-docs.sh b/build-docs.sh index 6a3e602d0..267f5a7f8 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -13,7 +13,7 @@ CONTRIBUTORS=doc/source/_contributors.rst echo "As of \`\`${git_describe}\`\` the developers and contributors are::" > $CONTRIBUTORS echo "" >> $CONTRIBUTORS -git shortlog -sn | awk '{first = $1; $1 = " "; print $0; }' >> $CONTRIBUTORS +git shortlog -sn HEAD | awk '{first = $1; $1 = " "; print $0; }' >> $CONTRIBUTORS (cd doc && make clean) if ! (cd doc && make html) ; then @@ -26,4 +26,3 @@ docdirectory=doc/build/html/ # Add a .nojekyll file # This prevents the GitHub jekyll website generator from running touch $docdirectory".nojekyll" - From 38e994159e8ef2a40f8fcda763d5b5fa144046c8 Mon Sep 17 00:00:00 2001 From: Rike-Benjamin Schuppner Date: Mon, 16 Oct 2023 23:45:22 +0200 Subject: [PATCH 2/2] BLD: Use checkout action v4 --- .github/workflows/build_docs.yml | 2 +- .github/workflows/pypi_release.yml | 2 +- .github/workflows/test_pytest.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index fe1d7d445..49ebdec66 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -10,7 +10,7 @@ jobs: deploy_docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # fetch all history and tags (needed for git describe) - name: Set up Python 3.12 diff --git a/.github/workflows/pypi_release.yml b/.github/workflows/pypi_release.yml index 6a3cff647..8e719fe32 100644 --- a/.github/workflows/pypi_release.yml +++ b/.github/workflows/pypi_release.yml @@ -13,7 +13,7 @@ jobs: name: Build and publish Python distributions to PyPI and TestPyPI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.12 uses: actions/setup-python@v4 diff --git a/.github/workflows/test_pytest.yml b/.github/workflows/test_pytest.yml index 186c70972..d03db8c41 100644 --- a/.github/workflows/test_pytest.yml +++ b/.github/workflows/test_pytest.yml @@ -16,7 +16,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -81,7 +81,7 @@ jobs: timeout-minutes: 15 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: