Skip to content

Commit

Permalink
nit
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrabyrd
chrabyrd committed Apr 19, 2024
1 parent 345516c commit a179386
Show file tree
Hide file tree
Showing 2 changed files with 111 additions and 138 deletions.
242 changes: 105 additions & 137 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,144 +13,112 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Check base branch
build:
runs-on: ubuntu-latest
services:
postgres:
image: postgis/postgis:13-3.0
env:
POSTGRES_PASSWORD: postgis
POSTGRES_DB: ${{ github.event.repository.name }}
ports:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
check-latest: true

- name: Install Java, GDAL, and other system dependencies
run: |
sudo apt update
sudo apt-get install libxml2-dev libpq-dev openjdk-8-jdk libgdal-dev libxslt-dev
echo Postgres and ES dependencies installed
- name: Install python packages
run: |
python -m pip install --upgrade pip
pip install .
pip install -r ${{ github.event.repository.name }}/install/requirements.txt
pip install -r ${{ github.event.repository.name }}/install/requirements_dev.txt
echo Python packages installed
- uses: ankane/setup-elasticsearch@v1
with:
elasticsearch-version: 8

- name: Check for missing migrations
run: |
python manage.py makemigrations --check
- name: Run unit tests
run: |
git fetch origin --prune
CURRENT_BRANCH=${{ github.event.pull_request.head.ref }}
TARGET_BRANCH="${{ github.event.pull_request.base.ref }}"
COMMON_ANCESTOR=$(git merge-base origin/$CURRENT_BRANCH origin/$TARGET_BRANCH)
COMMITS_BEHIND=$(git rev-list --count origin/$TARGET_BRANCH ^$COMMON_ANCESTOR)
if [ "$COMMITS_BEHIND" -eq 0 ]; then
echo "Your branch is up-to-date with the target branch."
elif [ "$COMMITS_BEHIND" -eq 1 ]; then
echo "Your branch is 1 commit behind the target branch."
python -W default::DeprecationWarning -m coverage run manage.py test tests --pattern="*.py" --settings="tests.test_settings"
- name: Generate report coverage
run: |
coverage json
- name: Upload coverage report as artifact
uses: actions/upload-artifact@v4
with:
name: ${{ github.event.pull_request.head.ref }}-coverage-report
path: coverage.json
overwrite: true

check-coverage:
needs: [build]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.x' # Use the latest available version
check-latest: true

- name: Download current branch coverage report artifact
uses: actions/download-artifact@v4
with:
name: ${{ github.event.pull_request.head.ref }}-coverage-report
path: .

- name: Report coverage
run: |
cat coverage.json
- name: Rename coverage.json -> current_branch_coverage.json
run: |
mv coverage.json current_branch_coverage.json
- name: Download target branch coverage report artifact
uses: actions/download-artifact@v4
with:
name: ${{ github.event.pull_request.base.ref }}-coverage-report
path: .

- name: Compare coverage with baseline
if: github.event_name == 'pull_request'
run: |
current_coverage=$(cat current_branch_coverage.json | grep -o '"totals": {[^}]*' | grep -o '"percent_covered": [0-9.]*' | awk -F ': ' '{print $2}')
target_coverage=$(cat coverage.json | grep -o '"totals": {[^}]*' | grep -o '"percent_covered": [0-9.]*' | awk -F ': ' '{print $2}')
# Compare current coverage with target coverage using floating-point comparison
if awk -v current="$current_coverage" -v baseline="$baseline_coverage" 'BEGIN { exit (current < baseline) ? 0 : 1 }'; then
echo "Coverage decreased from $baseline_coverage% to $current_coverage%"
exit 1
else
echo "Your branch is $COMMITS_BEHIND commits behind the target branch."
exit 1
echo "$baseline_coverage% == $current_coverage%, Coverage didn't decrease."
fi
# build:
# needs: [check-base-branch]

# runs-on: ubuntu-latest
# services:
# postgres:
# image: postgis/postgis:13-3.0
# env:
# POSTGRES_PASSWORD: postgis
# POSTGRES_DB: ${{ github.event.repository.name }}
# ports:
# - 5432:5432
# options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

# strategy:
# fail-fast: false
# matrix:
# python-version: ["3.10", "3.11", "3.12"]

# steps:
# - uses: actions/checkout@v4

# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ matrix.python-version }}
# check-latest: true

# - name: Install Java, GDAL, and other system dependencies
# run: |
# sudo apt update
# sudo apt-get install libxml2-dev libpq-dev openjdk-8-jdk libgdal-dev libxslt-dev
# echo Postgres and ES dependencies installed

# - name: Install python packages
# run: |
# python -m pip install --upgrade pip
# pip install .
# pip install -r ${{ github.event.repository.name }}/install/requirements.txt
# pip install -r ${{ github.event.repository.name }}/install/requirements_dev.txt
# echo Python packages installed

# - uses: ankane/setup-elasticsearch@v1
# with:
# elasticsearch-version: 8

# - name: Check for missing migrations
# run: |
# python manage.py makemigrations --check

# - name: Run unit tests
# run: |
# python -W default::DeprecationWarning -m coverage run manage.py test tests --pattern="*.py" --settings="tests.test_settings"

# - name: Generate report coverage
# run: |
# coverage json

# - name: Upload coverage report as artifact
# uses: actions/upload-artifact@v4
# with:
# name: coverage-report
# path: coverage.json
# overwrite: true

# check-coverage:
# needs: [check-base-branch, build]

# runs-on: ubuntu-latest

# steps:
# - uses: actions/checkout@v4

# - name: Set up Python
# uses: actions/setup-python@v5
# with:
# python-version: '3.x' # Use the latest available version
# check-latest: true

# - name: Download coverage report artifact
# uses: actions/download-artifact@v4
# with:
# name: coverage-report
# path: .

# - name: Report coverage
# run: |
# cat coverage.json

# - name: Retrieve baseline coverage
# run: |
# git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}

# if ! git show ${{ github.event.pull_request.base.ref }}:coverage.json > /dev/null; then
# echo "Error: coverage.json does not exist in the branch."
# exit 1
# fi

# baseline_coverage=$(git show ${{ github.event.pull_request.base.ref }}:coverage.json | grep -o '"totals": {[^}]*' | grep -o '"percent_covered": [0-9.]*' | awk -F ': ' '{print $2}')
# echo "$baseline_coverage" > .coverage_baseline

# - name: Compare coverage with baseline
# if: github.event_name == 'pull_request'
# run: |
# current_coverage=$(cat coverage.json | grep -o '"totals": {[^}]*' | grep -o '"percent_covered": [0-9.]*' | awk -F ': ' '{print $2}')
# baseline_coverage=$(cat .coverage_baseline)

# # Compare current coverage with baseline coverage using floating-point comparison
# if awk -v current="$current_coverage" -v baseline="$baseline_coverage" 'BEGIN { exit (current < baseline) ? 0 : 1 }'; then
# echo "Coverage decreased from $baseline_coverage% to $current_coverage%"
# exit 1
# else
# echo "$baseline_coverage% == $current_coverage%, Coverage didn't decrease. Committing new coverage.json."

# git config user.name github-actions
# git config user.email [email protected]

# git add -f coverage.json
# git commit -m "automatically update coverage.json"
# git push -f origin HEAD:${{ github.head_ref }}
# fi
7 changes: 6 additions & 1 deletion .github/workflows/update-test-coverage-artifact.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,9 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ${{ github.event.pull_request.base.ref }}-coverage-report
path: coverage.json
path: coverage.json

- uses: geekyeggo/delete-artifact@v5
with:
name: ${{ github.event.pull_request.head.ref }}-coverage-report

0 comments on commit a179386

Please sign in to comment.