Skip to content

Commit

Permalink
Merge branch 'mohr' into 'master'
Browse files Browse the repository at this point in the history
added test on freebsd in .gitlab-ci.yml

See merge request dlr-pa/pfu!13
  • Loading branch information
daniel-mohr committed Apr 25, 2023
2 parents aecb33e + 0a11f3a commit 7d3f5e5
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/unittest_pytest_coverage_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,16 +195,17 @@ jobs:
uses: vmactions/freebsd-vm@v0
with:
usesh: true
prepare: pkg install -y devel/py-setuptools devel/py-pytest devel/py-pytest-cov devel/py-pytest-xdist shells/bash
prepare: pkg install -y devel/py-setuptools devel/py-pytest devel/py-pytest-cov devel/py-pip
run: |
set -e -x
cat /etc/os-release
freebsd-version
pwd
ls -lah
whoami
freebsd-version
which python3.9
python3.9 setup.py install --record installed_files.txt
pip install .
which pfu
pfu -h
pfu simscrub -h
Expand All @@ -213,8 +214,7 @@ jobs:
pfu replicate -h
pfu speed_test -h
python3.9 setup.py run_unittest
python3.9 setup.py run_pytest --parallel --coverage
cat installed_files.txt | xargs rm -rf && echo "uninstalled/removed: "$(cat installed_files.txt)
python3.9 setup.py run_pytest --coverage
amd64_opensuse_leap_152_test:
needs: pep8_check
Expand Down
24 changes: 24 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,30 @@ opensuse_leap:latest_unittest:
name: opensuse/leap:latest
<<: *suse_based_unittest

freebsd:13:
stage: test
rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tags:
- FreeBSD-13-amd64
script:
- date
- cat /etc/os-release
- freebsd-version
- pkg -v
- pkg install -y devel/py-setuptools devel/py-pytest devel/py-pytest-cov devel/py-pip
- pip install .
- which pfu
- pfu -h
- pfu simscrub -h
- pfu create_checksum -h
- pfu check_checksum -h
- pfu replicate -h
- pfu speed_test -h
- python3.9 setup.py run_unittest
- python3.9 setup.py run_pytest --coverage

deploy_to_github:
stage: deploy
rules:
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ For example, it is compatible with the format produced by
sha256sum (GNU version) and sha256 (BSD version).

Further it is compatible with the checksum format used in
[PK-4](https://en.wikipedia.org/wiki/PK-4_(ISS_experiment)) [^a] [^b]
and was/is used in this project.
PK-4 [^a] [^b] and was/is used in this project.

[^a]: https://en.wikipedia.org/wiki/PK-4_(ISS_experiment)
[^b]: https://doi.org/10.1063/1.4962696
Expand Down

0 comments on commit 7d3f5e5

Please sign in to comment.