diff --git a/.github/workflows/render_readme.yml b/.github/workflows/generate_and_render_readme.yml similarity index 54% rename from .github/workflows/render_readme.yml rename to .github/workflows/generate_and_render_readme.yml index a71efbf..52bffbf 100644 --- a/.github/workflows/render_readme.yml +++ b/.github/workflows/generate_and_render_readme.yml @@ -1,20 +1,59 @@ -# .github/workflows/render_readme.yml +# .github/workflows/generate_and_render_readme.yml -name: Render new README based on tally updates +name: Generate and Render README on: pull_request: branches: - main paths: + - DETECTION_RESULTS.tsv - assets/positivity_tally.tsv + - .github/workflows/generate_tally.yml + - .github/workflows/generate_and_render_readme.yml - .github/workflows/render_readme.yml - scripts/splice_readme.py - - DETECTION_RESULTS.tsv jobs: + generate-tally: + name: Generate Positivity Tally + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.11" + + - name: Install Dependencies + run: | + pip install uv + uv venv + source .venv/bin/activate + uv pip install -r requirements.txt + + - name: Tally positive cartons per state + run: | + source .venv/bin/activate + python3 scripts/positivity_tally.py \ + DETECTION_RESULTS.tsv \ + assets/positivity_tally.tsv + + - name: Commit positivity tally + if: success() + run: | + git config --global user.name 'GitHub Actions Bot' + git config --global user.email 'actions@github.com' + git add assets/positivity_tally.tsv + git fetch origin proposals + git commit -m "Updating positivity tally" + git push --force-with-lease origin HEAD:proposals render-readme: name: Render new README + needs: generate-tally runs-on: ubuntu-latest steps: diff --git a/.github/workflows/generate_tally.yml b/.github/workflows/generate_tally.yml deleted file mode 100644 index b7d4bca..0000000 --- a/.github/workflows/generate_tally.yml +++ /dev/null @@ -1,50 +0,0 @@ -# .github/workflows/generate_tally.yml - -name: Generate Positivity Tally - -on: - pull_request: - branches: - - main - paths: - - DETECTION_RESULTS.tsv - - assets/positivity_tally.tsv - - .github/workflows/generate_tally.yml - -jobs: - generate-tally: - name: Generate Positivity Tally - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - - name: Install Dependencies - run: | - pip install uv - uv venv - source .venv/bin/activate - uv pip install -r requirements.txt - - - name: Tally positive cartons per state - run: | - source .venv/bin/activate - python3 scripts/positivity_tally.py \ - DETECTION_RESULTS.tsv \ - assets/positivity_tally.tsv - - - name: Commit positivity tally - if: success() - run: | - git config --global user.name 'GitHub Actions Bot' - git config --global user.email 'actions@github.com' - git add assets/positivity_tally.tsv - git fetch origin proposals - git commit -m "Updating positivity tally" - git push --force-with-lease origin HEAD:proposals