From 689e09eae41c658ccb26aacc0eda45c1d5c05b07 Mon Sep 17 00:00:00 2001 From: Anders Liland <8539036+andersliland@users.noreply.github.com> Date: Mon, 5 Feb 2024 09:03:48 +0100 Subject: [PATCH] ci: dont need seperate upload workflow --- .github/workflows/release-please.yml | 7 +- .../workflows/release-upload-artifacts.yml | 133 ------------------ .release-please-manifest.json | 2 +- release-please-config.json | 2 +- 4 files changed, 3 insertions(+), 141 deletions(-) delete mode 100644 .github/workflows/release-upload-artifacts.yml diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 36239169..797fe8a6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -23,11 +23,6 @@ jobs: - uses: google-github-actions/release-please-action@v4 id: release with: - # When you use the repository's GITHUB_TOKEN to perform tasks, events such as 'on.release' - # use in the Upload artifacts workflow wont be triggered. - # This prevents you from accidentally creating recursive workflow runs. - # We needed to use either a PAT og a GitHub App. - # https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow - token: ${{ secrets.TIENDABOT_ACCESS_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} config-file: release-please-config.json manifest-file: .release-please-manifest.json diff --git a/.github/workflows/release-upload-artifacts.yml b/.github/workflows/release-upload-artifacts.yml deleted file mode 100644 index f70dadbd..00000000 --- a/.github/workflows/release-upload-artifacts.yml +++ /dev/null @@ -1,133 +0,0 @@ ---- -name: "[release] Upload artifacts" - -on: - # Manually triggering this from main branch - # will upload artifacts to current release. - workflow_dispatch: - inputs: - tag: - type: string - description: Tag to checkout. View tags at https://github.com/kolonialno/troncos/tags - default: "" - push: - branches: - - release-test-** - release: - types: - # Trigger on creation of a draft is not possible - # https://github.com/orgs/community/discussions/7118 - # ref https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release - # This will trigger when a pre-release is created, but not when published. - - prereleased - -permissions: - id-token: write - contents: write - pull-requests: write - -env: - PYPI_TOKEN: "${{ secrets.PYPI_TOKEN }}" - -jobs: - tag: - runs-on: ubuntu-latest - name: Tag on commit - outputs: - upload: ${{ steps.tag.outputs.upload }} - tag: ${{ steps.tag.outputs.tag }} - steps: - - name: Checkout - uses: actions/checkout@v4 - if: ${{ github.event.inputs.tag == '' }} - - - name: Checkout tag (workflow_dispatch) - uses: actions/checkout@v4 - if: ${{ github.event.inputs.tag != '' }} - with: - ref: ${{ github.event.inputs.tag }} - - - name: Read .tool-versions - uses: marocchino/tool-versions-action@v1 - id: versions - - - name: Setup Python - uses: ./.github/actions/setup-python - with: - python-version: ${{ steps.versions.outputs.python }} - poetry-version: ${{ steps.versions.outputs.poetry }} - - # Only upload if current commit has a tag that match the version in - # Pyproject. This will only be the case for a troncos tag that has format - # x.y.z - # The other releases have component name prefixed. Eaxmple: component-x.y.z. - - name: Verify semVer tag on commit - id: tag - run: | - set -ex - if [ "${{ github.event.inputs.tag }}" == '' ]; then - - tag=$(git tag --points-at ${{ github.sha }}) - echo tag=$tag - echo "tag=$tag" >> $GITHUB_OUTPUT; - - project_version=$(poetry version -s) - echo project_version=$project_version - - if [ "$tag" == "$project_version" ]; then - echo "upload=true" >> $GITHUB_OUTPUT; - else - echo "upload=false" >> $GITHUB_OUTPUT; - fi - else - echo "upload=true" >> $GITHUB_OUTPUT; - fi - - python_package: - runs-on: ubuntu-latest - name: Python package - needs: tag - steps: - - name: Checkout - uses: actions/checkout@v4 - if: ${{ github.event.inputs.tag == '' }} - - - name: Checkout tag (workflow_dispatch) - uses: actions/checkout@v4 - if: ${{ github.event.inputs.tag != '' }} - with: - ref: ${{ github.event.inputs.tag }} - - - name: Read .tool-versions - uses: marocchino/tool-versions-action@v1 - id: versions - - - name: Setup Python - uses: ./.github/actions/setup-python - with: - python-version: ${{ steps.versions.outputs.python }} - poetry-version: ${{ steps.versions.outputs.poetry }} - - - name: Publish Troncos Python package - if: ${{ needs.tag.outputs.upload == 'true' }} - run: | - set -ex - make release - - publish: - runs-on: ubuntu-latest - name: Publish - needs: - - python_package - - tag - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Publish pre-release - if: ${{ needs.tag.outputs.upload == 'true' }} - run: | - set -ex - gh release edit ${{ needs.tag.outputs.tag }} --prerelease=false --latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 2276f3d2..f4b3cc51 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "4.3.1" + ".": "4.4.1" } diff --git a/release-please-config.json b/release-please-config.json index 8a149cb5..f0bb91a7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", - "bootstrap-sha": "3c032c809f68f677d12fdac5557351cde40bffd7", + "bootstrap-sha": "8ed4b839a6c7808f551baea9284eb7e36be7ef58", "include-v-in-tag": false, "separate-pull-requests": true, "prerelease": true,