From 915f5ad75ea904b9ce9cf4b448a5fe83c0e1670f Mon Sep 17 00:00:00 2001 From: Gonzalo Casas Date: Sat, 28 Sep 2024 00:23:41 +0200 Subject: [PATCH] Revert back to release from main because nothing works --- .github/workflows/release.yml | 24 ++---------------------- CONTRIBUTING.md | 13 ++----------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b39aacc..2df918e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,7 @@ on: push: - branches: - - main + tags: + - 'v*' name: Create Release @@ -12,28 +12,9 @@ jobs: matrix: os: [ubuntu-latest] python: ['3.9'] - outputs: - ready_to_release: ${{ steps.check_version_tag.outputs.version_tag_exists }} steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Fetch all tags - run: git fetch --tags - - name: Check for tags - id: check_version_tag - run: | - TAGS=$(git tag --points-at HEAD) - if [[ "$TAGS" == *v* ]]; then - echo "Version tag found! Building new release: $TAGS" - echo "version_tag_exists=true" >> $GITHUB_OUTPUT - else - echo "No version tag found. Skipping workflow." - echo "version_tag_exists=false" >> $GITHUB_OUTPUT - fi - - uses: compas-dev/compas-actions.build@v3 - if: steps.check_version_tag.outputs.version_tag_exists == 'true' with: python: ${{ matrix.python }} invoke_lint: true @@ -42,7 +23,6 @@ jobs: publish: needs: build runs-on: windows-latest - if: needs.build.outputs.ready_to_release == 'true' steps: - uses: compas-dev/compas-actions.publish@v2 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b0ffae..bbcd1a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -66,13 +66,7 @@ To create a new release, follow these steps: 1. Ensure all changes intended for the release are merged into the **main** branch. -2. Create a new branch from **main** to prepare the release (replace `x.y.z` with the version number you plan to release): - - ```bash - git checkout main - git pull - git checkout -b prepare-release-x.y.z - ``` +2. Ensure you have locally checked out the **main** branch. 3. Ensure all checks and tests pass successfully. Use the `invoke check` and `invoke test` commands to verify. @@ -86,7 +80,4 @@ To create a new release, follow these steps: ```bash invoke release [release_type] ``` -6. Create a merge request to merge the branch into **main**. Check the changes and make sure - everything looks good, before merging. - -7. Celebrate! 💃 +6. Celebrate! 💃