Skip to content

Commit

Permalink
[REGRESSION] Possible fixes for multiple regressions in CI (- WIP $41 &
Browse files Browse the repository at this point in the history
#46 & #49 -)

Changes in file .github/workflows/Tests.yml:
 - use same setup as real test when checking for regressions

Changes in file tests/check_cc_lines:
 - workaround for missing `shlock`

Changes in file tests/check_codecov:
 - workaround for missing `shlock`
  • Loading branch information
reactive-firewall committed Aug 27, 2024
1 parent 2a87a99 commit e2a21a2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Setup dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade pip setuptools build wheel
pip install -r ./requirements.txt
- name: Pre-build
id: bootstrap
Expand Down Expand Up @@ -401,11 +401,11 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Install dependencies for python ${{ matrix.python-version }} on ${{ matrix.os }}
run: |
pip install --upgrade pip setuptools wheel
pip install -r ./requirements.txt ;
pip install coverage ;
pip install pytest ;
pip install pytest-cov ;
pip install --upgrade --upgrade-strategy eager pip setuptools build wheel ;
pip install --upgrade --upgrade-strategy eager -r ./requirements.txt ;
pip install --upgrade --upgrade-strategy eager pytest ;
pip install --upgrade --upgrade-strategy eager pytest-cov ;
pip install --upgrade --upgrade-strategy eager coverage ;
if: ${{ !cancelled() }}
- name: Pre-Clean
id: clean-prep
Expand Down
3 changes: 3 additions & 0 deletions tests/check_cc_lines
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ test -x $(command -v grep) || exit 126 ;
test -x $(command -v curl) || exit 126 ;
test -x $(command -v find) || exit 126 ;
test -x $(command -v git) || exit 126 ;
hash -p ./.github/tool_shlock_helper.sh shlock || exit 255 ;
test -x "$(command -v shlock)" || exit 126 ;


function cleanup() {
rm -f ${LOCK_FILE} 2>/dev/null || true ; wait ;
Expand Down
4 changes: 3 additions & 1 deletion tests/check_codecov
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ EXIT_CODE=0

test -x $(command -v grep) || exit 126 ;
test -x $(command -v curl) || exit 126 ;
hash -p ./.github/tool_shlock_helper.sh shlock || exit 255 ;
test -x "$(command -v shlock)" || exit 126 ;
test -x $(command -v gpgv) || exit 126 ;
test -x $(command -v shasum) || exit 126 ;

# sorry no windows support here
if [[ $( \uname -s ) == "Darwin" ]] ; then
if [[ $( \uname -s ) == "*arwin" ]] ; then
CI_OS="macos"
else
CI_OS="linux"
Expand Down

0 comments on commit e2a21a2

Please sign in to comment.