diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml deleted file mode 100644 index 5073ce3..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ /dev/null @@ -1,97 +0,0 @@ -name: 🐞 Bug -description: Create a report to help us improve -title: "[BUG] " -labels: [bug, needs triage] - -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this bug report! - - type: checkboxes - attributes: - label: Is there an existing issue for this? - description: Please search to see if an issue already exists for the bug you encountered. - options: - - label: I have searched the existing issues - required: true - - type: checkboxes - attributes: - label: Does this issue exist in the latest version? - description: Please view all releases to confirm that this issue hasn't already been fixed. - options: - - label: I'm using the latest release - required: true - - type: textarea - id: what-happened - attributes: - label: Describe the bug? - description: A clear and concise description of what the bug is - placeholder: Tell us what you see! - validations: - required: true - - type: textarea - id: reproduce - attributes: - label: To Reproduce - description: Steps to reproduce the behavior? - placeholder: | - 1. In this environment... - 2. With this config... - 3. Run '...' - 4. See error... - validations: - required: true - - type: dropdown - id: os - attributes: - label: What OS are you seeing the problem on? - multiple: true - options: - - all - - ubuntu-latest or ubuntu-20.04 - - ubuntu-18.04 - - macos-latest or macos-10.15 - - macos-11 - - windows-latest or windows-2019 - - windows-2016 - validations: - required: true - - type: textarea - id: expected - attributes: - label: Expected behavior? - description: A clear and concise description of what you expected to happen. - placeholder: Tell us what you expected! - validations: - required: true - - type: textarea - id: logs - attributes: - label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. - placeholder: | - This can be achieved by: - 1. Re-running the workflow with debug logging enabled. - 2. Copy or download the log archive. - 3. Paste the contents here or upload the file in a subsequent comment. - render: shell - - type: textarea - attributes: - label: Anything else? - description: | - Links? or References? - - Anything that will give us more context about the issue you are encountering! - - Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. - validations: - required: false - - type: checkboxes - id: terms - attributes: - label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](../blob/main/CODE_OF_CONDUCT.md) - options: - - label: I agree to follow this project's Code of Conduct - required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml deleted file mode 100644 index 9f930cc..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: Feature request -description: Suggest an idea for this project -title: "[Feature] <title>" -labels: [enhancement] - -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this feature request! - - type: checkboxes - attributes: - label: Is this feature missing in the latest version? - description: Please upgrade to the latest version to verify that this feature is still missing. - options: - - label: I'm using the latest release - required: true - - type: textarea - id: what-happened - attributes: - label: Is your feature request related to a problem? Please describe. - description: | - A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - placeholder: Tell us what you see! - validations: - required: true - - type: textarea - id: requests - attributes: - label: Describe the solution you'd like? - description: A clear and concise description of what you want to happen. - validations: - required: true - - type: textarea - id: alternative - attributes: - label: Describe alternatives you've considered? - description: A clear and concise description of any alternative solutions or features you've considered. - validations: - required: false - - type: textarea - attributes: - label: Anything else? - description: | - Links? or References? - - Add any other context or screenshots about the feature request here. - - Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. - validations: - required: false - - type: checkboxes - id: terms - attributes: - label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](../blob/main/CODE_OF_CONDUCT.md) - options: - - label: I agree to follow this project's Code of Conduct - required: true diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml deleted file mode 100644 index 0de2e3d..0000000 --- a/.github/workflows/auto-approve.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Auto approve - -on: - pull_request_target - -jobs: - auto-approve: - runs-on: ubuntu-latest - steps: - - uses: hmarr/auto-approve-action@v3 - if: | - ( - github.event.pull_request.user.login == 'dependabot[bot]' || - github.event.pull_request.user.login == 'dependabot' || - github.event.pull_request.user.login == 'dependabot-preview[bot]' || - github.event.pull_request.user.login == 'dependabot-preview' || - github.event.pull_request.user.login == 'renovate[bot]' || - github.event.pull_request.user.login == 'renovate' || - github.event.pull_request.user.login == 'github-actions[bot]' - ) - && - ( - github.actor == 'dependabot[bot]' || - github.actor == 'dependabot' || - github.actor == 'dependabot-preview[bot]' || - github.actor == 'dependabot-preview' || - github.actor == 'renovate[bot]' || - github.actor == 'renovate' || - github.actor == 'github-actions[bot]' - ) - with: - github-token: ${{ secrets.PAT_TOKEN }} diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index 43086ff..0000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: automerge -on: - check_suite: - types: - - completed - -jobs: - automerge: - runs-on: ubuntu-latest - if: | - github.actor == 'dependabot[bot]' || - github.actor == 'dependabot' || - github.actor == 'dependabot-preview[bot]' || - github.actor == 'dependabot-preview' || - github.actor == 'renovate[bot]' || - github.actor == 'renovate' - steps: - - name: automerge - uses: pascalgn/automerge-action@v0.15.5 - env: - GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} - MERGE_METHOD: "rebase" - UPDATE_METHOD: "rebase" - MERGE_RETRIES: "6" - MERGE_RETRY_SLEEP: "100000" - MERGE_LABELS: "" \ No newline at end of file diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml index e315344..3eb3f7e 100644 --- a/.github/workflows/codacy-analysis.yml +++ b/.github/workflows/codacy-analysis.yml @@ -8,6 +8,9 @@ name: Codacy Security Scan +permissions: + contents: read + on: push: branches: [ main ] @@ -29,12 +32,12 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis - name: Run Codacy Analysis CLI continue-on-error: true - uses: codacy/codacy-analysis-cli-action@v4.2.0 + uses: codacy/codacy-analysis-cli-action@v4.4.0 with: # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository # You can also omit the token and run the tools that support default configurations @@ -51,6 +54,6 @@ jobs: # Upload the SARIF file generated in the previous step - name: Upload SARIF results file continue-on-error: true - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: results.sarif diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml deleted file mode 100644 index d3ebb71..0000000 --- a/.github/workflows/greetings.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Greetings - -on: [pull_request_target, issues] - -jobs: - greeting: - runs-on: ubuntu-latest - steps: - - uses: actions/first-interaction@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: "Thanks for reporting this issue, don't forget to star this project if you haven't already to help us reach a wider audience." - pr-message: "Thanks for implementing a fix, could you ensure that the test covers your changes if applicable." diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 0c601fd..47b9198 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -8,7 +8,7 @@ jobs: if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: token: ${{ secrets.PAT_TOKEN }} fetch-depth: 0 # otherwise, you will failed to push refs to dest repo diff --git a/.github/workflows/sync-release-version.yml b/.github/workflows/sync-release-version.yml index 187336f..f517042 100644 --- a/.github/workflows/sync-release-version.yml +++ b/.github/workflows/sync-release-version.yml @@ -8,11 +8,11 @@ jobs: update-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Run release-tagger - uses: tj-actions/release-tagger@v2 + uses: tj-actions/release-tagger@v4 - name: Sync release version. uses: tj-actions/sync-release-version@v13 id: sync-release-version @@ -21,12 +21,10 @@ jobs: only_major: true paths: | README.md - - name: Generate CHANGELOG - uses: tj-actions/github-changelog-generator@v1.17 - with: - output: 'HISTORY.md' + - name: Run git-cliff + uses: tj-actions/git-cliff@v1 - name: Create Pull Request - uses: peter-evans/create-pull-request@v4.2.3 + uses: peter-evans/create-pull-request@v6.0.1 with: base: "main" labels: "merge when passing" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c27a616..8d2ddcc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,8 @@ name: CI +permissions: + contents: read + on: release: types: @@ -19,7 +22,7 @@ jobs: name: Test semver-diff steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: shellcheck uses: reviewdog/action-shellcheck@v1 - name: Run semver-diff diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 4996ba3..840d649 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -9,18 +9,18 @@ jobs: sync-assets: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: Run auto-doc - uses: tj-actions/auto-doc@v1.7.3 + uses: tj-actions/auto-doc@v3.4.1 - name: Run test uses: tj-actions/remark@v3 - name: Verify Changed files - uses: tj-actions/verify-changed-files@v13 + uses: tj-actions/verify-changed-files@v19 id: verify_changed_files with: files: | @@ -34,7 +34,7 @@ jobs: - name: Create Pull Request if: failure() - uses: peter-evans/create-pull-request@v4.2.3 + uses: peter-evans/create-pull-request@v6.0.1 with: base: "main" labels: "merge when passing" diff --git a/HISTORY.md b/HISTORY.md index 91c6369..7514930 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,12 +1,20 @@ # Changelog -## [v2.4.0](https://github.com/tj-actions/semver-diff/tree/v2.4.0) (2023-01-10) +## [v2.4.1](https://github.com/tj-actions/semver-diff/tree/v2.4.1) (2023-01-10) -[Full Changelog](https://github.com/tj-actions/semver-diff/compare/v2...v2.4.0) +[Full Changelog](https://github.com/tj-actions/semver-diff/compare/v2...v2.4.1) ## [v2](https://github.com/tj-actions/semver-diff/tree/v2) (2023-01-10) -[Full Changelog](https://github.com/tj-actions/semver-diff/compare/v2.3.0...v2) +[Full Changelog](https://github.com/tj-actions/semver-diff/compare/v2.4.0...v2) + +**Merged pull requests:** + +- Upgraded to v2.4.0 [\#89](https://github.com/tj-actions/semver-diff/pull/89) ([jackton1](https://github.com/jackton1)) + +## [v2.4.0](https://github.com/tj-actions/semver-diff/tree/v2.4.0) (2023-01-10) + +[Full Changelog](https://github.com/tj-actions/semver-diff/compare/v2.3.0...v2.4.0) **Merged pull requests:** diff --git a/README.md b/README.md index aefbe6d..57b4617 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest name: semver-diff steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run semver-diff id: semver-diff uses: tj-actions/semver-diff@v2 @@ -51,7 +51,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -74,7 +74,7 @@ jobs: - name: bumpversion run: | - bump2version PART="${{ steps.semver-diff.outputs.release_type }}" + bump2version "${{ steps.semver-diff.outputs.release_type }}" git switch -c main - name: Build and publish to PyPi @@ -91,9 +91,9 @@ jobs: <!-- AUTO-DOC-INPUT:START - Do not remove or modify this section --> -| INPUT | TYPE | REQUIRED | DEFAULT | DESCRIPTION | -|----------------------|--------|----------|-----------|-------------------------------------------------------------------| -| initial\_release\_type | string | true | `"patch"` | Initial release type returned when there<br>are no existing tags. | +| INPUT | TYPE | REQUIRED | DEFAULT | DESCRIPTION | +|----------------------------------------------------------------------------------------------|--------|----------|-----------|---------------------------------------------------------------------| +| <a name="input_initial_release_type"></a>[initial\_release\_type](#input_initial_release_type) | string | true | `"patch"` | Initial release type returned when <br>there are no existing tags. | <!-- AUTO-DOC-INPUT:END --> @@ -101,11 +101,11 @@ jobs: <!-- AUTO-DOC-OUTPUT:START - Do not remove or modify this section --> -| OUTPUT | TYPE | DESCRIPTION | -|--------------|--------|---------------------------------------------------------------------------------------------------------| -| new\_version | string | The current project version | -| old\_version | string | The previous project version | -| release\_type | string | The difference between two versions by<br> the release type (major, minor, patch,<br>prerelease, build) | +| OUTPUT | TYPE | DESCRIPTION | +|------------------------------------------------------------------------|--------|-----------------------------------------------------------------------------------------------------------------| +| <a name="output_new_version"></a>[new\_version](#output_new_version) | string | The current project version | +| <a name="output_old_version"></a>[old\_version](#output_old_version) | string | The previous project version | +| <a name="output_release_type"></a>[release\_type](#output_release_type) | string | The difference between two versions <br>by the release type (`major`, `minor`, `patch`, `prerelease`, `build`) | <!-- AUTO-DOC-OUTPUT:END --> diff --git a/action.yml b/action.yml index 866fe50..16c57d6 100644 --- a/action.yml +++ b/action.yml @@ -9,7 +9,7 @@ inputs: outputs: release_type: - description: 'The difference between two versions by the release type (major, minor, patch, prerelease, build)' + description: 'The difference between two versions by the release type (`major`, `minor`, `patch`, `prerelease`, `build`)' value: ${{ steps.semver.outputs.release_type }} new_version: description: 'The current project version' diff --git a/entrypoint.sh b/entrypoint.sh index 67e4fcc..ec66b47 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -17,26 +17,15 @@ CURRENT_TAG=${3:-$(git tag -l --sort=-version:refname "*.*" | grep -v "$NEW_TAG" if [[ -z $CURRENT_TAG ]]; then echo "::warning::Initial release detected unable to determine any tag diff." echo "::warning::Setting release_type to $INPUT_INITIAL_RELEASE_TYPE." - - if [[ -z "$GITHUB_OUTPUT" ]]; then - echo "::set-output name=release_type::$INPUT_INITIAL_RELEASE_TYPE" - else - echo "release_type=$INPUT_INITIAL_RELEASE_TYPE" >> "$GITHUB_OUTPUT" - fi + echo "release_type=$INPUT_INITIAL_RELEASE_TYPE" >> "$GITHUB_OUTPUT" exit 0; fi echo "::debug::Calculating diff..." -PART=$(wget -O - https://raw.githubusercontent.com/fsaintjacques/semver-tool/3.3.0/src/semver | bash -s diff "${CURRENT_TAG//v/}" "${NEW_TAG//v/}") - -if [[ -z "$GITHUB_OUTPUT" ]]; then - echo "::set-output name=release_type::$PART" - echo "::set-output name=old_version::$CURRENT_TAG" - echo "::set-output name=new_version::$NEW_TAG" -else - cat <<EOF >> "$GITHUB_OUTPUT" +PART=$(wget -O - https://raw.githubusercontent.com/fsaintjacques/semver-tool/3.4.0/src/semver | bash -s diff "${CURRENT_TAG//v/}" "${NEW_TAG//v/}") + +cat <<EOF >> "$GITHUB_OUTPUT" release_type=$PART old_version=$CURRENT_TAG new_version=$NEW_TAG EOF -fi diff --git a/renovate.json b/renovate.json index 36d794a..cba201d 100644 --- a/renovate.json +++ b/renovate.json @@ -7,7 +7,8 @@ "prConcurrentLimit": 5, "rebaseWhen": "behind-base-branch", "addLabels": [ - "dependencies" + "dependencies", + "merge when passing" ], "assignees": [ "jackton1" @@ -19,13 +20,21 @@ "enabled": true, "automerge": true }, + "nvm": { + "enabled": false + }, "packageRules": [ { - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "matchUpdateTypes": [ + "minor", + "patch", + "pin", + "digest" + ], "automerge": true, "rebaseWhen": "behind-base-branch", "addLabels": [ - "automerge" + "merge when passing" ] }, { @@ -33,10 +42,15 @@ "matchLanguages": [ "docker" ], - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "matchUpdateTypes": [ + "minor", + "patch", + "pin", + "digest" + ], "rebaseWhen": "behind-base-branch", "addLabels": [ - "automerge" + "merge when passing" ], "automerge": true }