From 14f08d56cf822275dafe84d1f968d6175efa25d6 Mon Sep 17 00:00:00 2001 From: geisserml Date: Tue, 31 Oct 2023 19:13:47 +0100 Subject: [PATCH] Revert "XXX make renamed workflow visible" This reverts commit 4c0ed1ee0f1f270db1302380dbdeba1465f811b6. --- .github/workflows/main.yaml | 77 ++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 17507381d..1e6430c0c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -3,7 +3,6 @@ name: Main packaging on: - pull_request: workflow_dispatch: inputs: pre_test: @@ -189,49 +188,49 @@ jobs: with: name: release_notes - # - name: Apply and push repository changes - # run: | - # git config user.email "geisserml@gmail.com" - # git config user.name "geisserml" - # git checkout main - # git merge origin/autorelease_tmp - # git tag -a ${{ needs.build.outputs.new_version }} -m "Autorelease" - # git push - # git push --tags - # git checkout stable - # git reset --hard main - # git push --force - # git checkout main + - name: Apply and push repository changes + run: | + git config user.email "geisserml@gmail.com" + git config user.name "geisserml" + git checkout main + git merge origin/autorelease_tmp + git tag -a ${{ needs.build.outputs.new_version }} -m "Autorelease" + git push + git push --tags + git checkout stable + git reset --hard main + git push --force + git checkout main - # - name: Publish to GitHub - # uses: ncipollo/release-action@v1 - # with: - # artifacts: 'dist/*' - # bodyFile: 'RELEASE.md' - # token: ${{ secrets.GITHUB_TOKEN }} - # tag: ${{ needs.build.outputs.new_version }} - # prerelease: ${{ contains(needs.build.outputs.new_version, 'b') }} + - name: Publish to GitHub + uses: ncipollo/release-action@v1 + with: + artifacts: 'dist/*' + bodyFile: 'RELEASE.md' + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ needs.build.outputs.new_version }} + prerelease: ${{ contains(needs.build.outputs.new_version, 'b') }} - # # Upload to TestPyPI / PyPI via "trusted publishing". - # # https://docs.pypi.org/trusted-publishers/adding-a-publisher/ - # # https://docs.pypi.org/trusted-publishers/using-a-publisher/ - # # https://github.com/pypa/gh-action-pypi-publish + # Upload to TestPyPI / PyPI via "trusted publishing". + # https://docs.pypi.org/trusted-publishers/adding-a-publisher/ + # https://docs.pypi.org/trusted-publishers/using-a-publisher/ + # https://github.com/pypa/gh-action-pypi-publish - # - name: Publish to TestPyPI - # uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # repository-url: https://test.pypi.org/legacy/ - # packages-dir: dist/ # the default + - name: Publish to TestPyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + packages-dir: dist/ # the default - # - name: Publish to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 - # with: - # packages-dir: dist/ # the default + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: dist/ # the default - # - name: Trigger GH Pages rebuild - # uses: benc-uk/workflow-dispatch@v1 - # with: - # workflow: gh_pages.yaml # takes no inputs + - name: Trigger GH Pages rebuild + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: gh_pages.yaml # takes no inputs conda_trigger: needs: [build, test, publish]