diff --git a/.github/workflows/release_notes.yml b/.github/workflows/prepare_release.yml similarity index 66% rename from .github/workflows/release_notes.yml rename to .github/workflows/prepare_release.yml index 501c4892..a755683b 100644 --- a/.github/workflows/release_notes.yml +++ b/.github/workflows/prepare_release.yml @@ -1,10 +1,10 @@ -name: Release Notes Generator +name: Release Prep on: workflow_dispatch: inputs: branch: - description: 'Branch to merge release notes into.' + description: 'Branch to merge release notes and code analysis into.' required: true default: 'main' version: @@ -15,7 +15,7 @@ on: 'Date of the release. Must be in format YYYY-MM-DD.' jobs: - releasenotesgeneration: + preparerelease: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -28,25 +28,30 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install requests==2.31.0 + python -m pip install bandit==1.7.7 + python -m pip install .[test] - name: Generate release notes env: GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} run: > - python -m scripts.release_notes_generator + python scripts/release_notes_generator.py -v ${{ inputs.version }} -d ${{ inputs.date }} + - name: Save static code analysis + run: bandit -r . -x ./tests,./scripts,./build -f txt -o static_code_analysis.txt --exit-zero + - name: Create pull request id: cpr uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GH_ACCESS_TOKEN }} - commit-message: Release notes for v${{ inputs.version }} + commit-message: Prepare release for v${{ inputs.version }} author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" - title: v${{ inputs.version }} Release Notes - body: "This is an auto-generated PR to update the release notes." - branch: release-notes + title: v${{ inputs.version }} Release Preparation + body: "This is an auto-generated PR to prepare the release." + branch: prepared-release branch-suffix: short-commit-hash base: ${{ inputs.branch }} diff --git a/.github/workflows/static_code_analysis.yml b/.github/workflows/static_code_analysis.yml deleted file mode 100644 index e5dfac04..00000000 --- a/.github/workflows/static_code_analysis.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Static Code Analysis - -on: - release: - types: [published] - workflow_dispatch: - -jobs: - code-analysis: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - python -m pip install bandit==1.7.7 - - name: Save code analysis - run: bandit -r . -x ./tests,./scripts -f txt -o static_code_analysis.txt --exit-zero - - name: Create pull request - id: cpr - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GH_ACCESS_TOKEN }} - commit-message: Update static code analysis - author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" - committer: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" - title: Latest Code Analysis - body: "This is an auto-generated PR with the **latest** code analysis results." - branch: static-code-analysis - branch-suffix: short-commit-hash - base: main diff --git a/HISTORY.md b/HISTORY.md index d0b4d569..a7fce8b6 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,11 @@ # History +## v1.13.3 - 2025-01-09 + +### Maintenance + +* Combine `static_code_analysis.yml` with `release_notes.yml` - Issue [#915](https://github.com/sdv-dev/RDT/issues/915) by @R-Palazzo + ## v1.13.2 - 2024-12-16 ### Bugs Fixed diff --git a/static_code_analysis.txt b/static_code_analysis.txt index c06e0ed6..e14d3467 100644 --- a/static_code_analysis.txt +++ b/static_code_analysis.txt @@ -1,4 +1,4 @@ -Run started:2024-12-16 23:01:53.056528 +Run started:2025-01-09 12:29:34.664493 Test results: No issues identified.