From 692d9ea2b090f47f71537bfec743194a0698e232 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Tue, 31 Oct 2023 16:25:50 -0400 Subject: [PATCH 1/3] update manual_deploy workflow --- .github/workflows/manual_deploy.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual_deploy.yml b/.github/workflows/manual_deploy.yml index 730ef4e9b..0b556fd2f 100644 --- a/.github/workflows/manual_deploy.yml +++ b/.github/workflows/manual_deploy.yml @@ -22,9 +22,18 @@ jobs: python -m mkdocs build --clean --verbose - name: Publish if: success() - uses: peaceiris/actions-gh-pages@v3 + # uses: peaceiris/actions-gh-pages@v3 + # with: + # deploy_key: ${{ secrets.PAGES_DEPLOY_KEY }} + # external_repository: Python-Markdown/Python-Markdown.github.io + # publish_branch: master + # publish_dir: ./site + uses: cpina/github-action-push-to-another-repository@main + env: + SSH_DEPLOY_KEY: ${{ secrets.PAGES_DEPLOY_KEY }} with: - deploy_key: ${{ secrets.PAGES_DEPLOY_KEY }} - external_repository: Python-Markdown/Python-Markdown.github.io - publish_branch: master - publish_dir: ./site + source-directory: 'site' + destination-github-username: 'Python-Markdown' + destination-repository-name: 'Python-Markdown.github.io' + user-name: ${{ github.actor }} + target-branch: master From bb789f02c752b9b7e47f2ddd366402f2b934e44f Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Thu, 2 Nov 2023 10:20:37 -0400 Subject: [PATCH 2/3] update deploy workflow --- .github/workflows/changelog.yml | 2 +- .github/workflows/deploy.yml | 23 +++++++++++++---------- .github/workflows/docs.yml | 2 +- .github/workflows/manual_deploy.yml | 12 +++--------- .github/workflows/tox.yml | 8 ++++---- .github/workflows/version_check.yml | 4 ++-- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index dec6ca2f0..37baee430 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Ensure Changelog Entry Made uses: dangoslen/changelog-enforcer@v3 with: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b10bf7e57..f52cf28a7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,9 +10,9 @@ jobs: pypi: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.11 - name: Install dependencies @@ -49,9 +49,9 @@ jobs: ghpages: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.11 - name: Install dependencies @@ -61,11 +61,14 @@ jobs: - name: Build run: | python -m mkdocs build --clean --verbose - - name: Publish to GitHub Pages + - name: Publish if: success() - uses: peaceiris/actions-gh-pages@v3 + uses: cpina/github-action-push-to-another-repository@main + env: + SSH_DEPLOY_KEY: ${{ secrets.PAGES_DEPLOY_KEY }} with: - deploy_key: ${{ secrets.PAGES_DEPLOY_KEY }} - external_repository: Python-Markdown/Python-Markdown.github.io - publish_branch: master - publish_dir: ./site + source-directory: 'site' + destination-github-username: 'Python-Markdown' + destination-repository-name: 'Python-Markdown.github.io' + user-name: ${{ github.actor }} + target-branch: master diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f487a38ab..cd153d29b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -12,7 +12,7 @@ jobs: markdown-link-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: use-quiet-mode: yes diff --git a/.github/workflows/manual_deploy.yml b/.github/workflows/manual_deploy.yml index 0b556fd2f..e646d9f5e 100644 --- a/.github/workflows/manual_deploy.yml +++ b/.github/workflows/manual_deploy.yml @@ -8,11 +8,11 @@ jobs: ghpages: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.11 - name: Install dependencies run: | python -m pip install --upgrade pip setuptools @@ -22,12 +22,6 @@ jobs: python -m mkdocs build --clean --verbose - name: Publish if: success() - # uses: peaceiris/actions-gh-pages@v3 - # with: - # deploy_key: ${{ secrets.PAGES_DEPLOY_KEY }} - # external_repository: Python-Markdown/Python-Markdown.github.io - # publish_branch: master - # publish_dir: ./site uses: cpina/github-action-push-to-another-repository@main env: SSH_DEPLOY_KEY: ${{ secrets.PAGES_DEPLOY_KEY }} diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 9d258030c..7860d8c7c 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -45,9 +45,9 @@ jobs: TOXENV: ${{ matrix.tox-env }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -77,9 +77,9 @@ jobs: TOXENV: ${{ matrix.tox-env }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.11 - name: Install dependencies diff --git a/.github/workflows/version_check.yml b/.github/workflows/version_check.yml index 6c8e4649a..1eae842b8 100644 --- a/.github/workflows/version_check.yml +++ b/.github/workflows/version_check.yml @@ -12,9 +12,9 @@ jobs: check_version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.11' - name: Install dependencies From b651ab1ee43dfb135c6b2b07da325ce6e687b221 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Thu, 2 Nov 2023 10:25:49 -0400 Subject: [PATCH 3/3] eliminate last warning --- .github/workflows/tox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 7860d8c7c..8f45e22e6 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -58,7 +58,7 @@ jobs: run: python -m tox - name: Upload Results if: success() - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: file: ./coverage.xml flags: unittests