diff --git a/.github/workflows/report_linux.yml b/.github/workflows/report_linux.yml index 907dc2b42..ac0d2b0e2 100644 --- a/.github/workflows/report_linux.yml +++ b/.github/workflows/report_linux.yml @@ -14,7 +14,9 @@ jobs: #-------- Operating Systems ---------------- - { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 } - { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 } + - { os: rockylinux, tag: 9, arch: rhel, arch_ver: 9 } - { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 } + - { os: oraclelinux, tag: 9, arch: rhel, arch_ver: 9 } python: [3] diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 1c58ce6e3..791b07a68 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -24,7 +24,9 @@ jobs: #-------- Operating Systems ---------------- - { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 } - { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 } + - { os: rockylinux, tag: 9, arch: rhel, arch_ver: 9 } - { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 } + - { os: oraclelinux, tag: 9, arch: rhel, arch_ver: 9 } python: [3] #-------- Defaults -------------------------- @@ -92,9 +94,8 @@ jobs: udunits2-devel which zlib-devel - python2-devel python3-devel -#-------- RHEL 8-based Only Dependencies ---------------- +#-------- RHEL-based Common Dependencies ---------------- - cfg: { arch: rhel, arch_ver: 8 } pkg_mgr: dnf tag_deps: >- @@ -104,14 +105,44 @@ jobs: dnf -y install epel-release dnf -y update dnf install -y 'dnf-command(config-manager)' + - cfg: { arch: rhel, arch_ver: 9 } + pkg_mgr: dnf + tag_deps: >- + diffutils + conf_pkg: | + dnf -y install epel-release + dnf -y update + dnf install -y 'dnf-command(config-manager)' +#-------- Rocky Linux Specific Dependencies ---------------- + - cfg: { os: rockylinux, tag: 8 } install_gtest: | dnf config-manager --enable powertools dnf install -y gtest-devel gmock-devel -#-------- OS and Version Specific Dependencies ---------------- - - cfg: { os: oraclelinux } + - cfg: { os: rockylinux, tag: 9 } + tag_deps: >- + swig + conf_pkg: | + dnf -y install epel-release + dnf -y update + dnf install -y 'dnf-command(config-manager)' + dnf config-manager --set-enabled crb + install_gtest: | + dnf install -y gtest-devel gmock-devel +#-------- Oracle Linux Specific Dependencies ---------------- + - cfg: { os: oraclelinux, tag: 8 } install_gtest: | dnf config-manager --enable ol8_codeready_builder dnf install -y gtest-devel gmock-devel + - cfg: { os: oraclelinux, tag: 9 } + tag_deps: >- + swig + conf_pkg: | + dnf -y install epel-release + dnf -y update + dnf install -y 'dnf-command(config-manager)' + dnf config-manager --enable ol9_codeready_builder + install_gtest: | + dnf install -y gtest-devel gmock-devel #-------- Job definition ---------------- runs-on: ubuntu-latest container: docker://${{matrix.cfg.os}}:${{matrix.cfg.tag}} diff --git a/.github/workflows/trickops.yml b/.github/workflows/trickops.yml index 71c653639..1a7553504 100644 --- a/.github/workflows/trickops.yml +++ b/.github/workflows/trickops.yml @@ -71,6 +71,38 @@ jobs: share/trick/trickops/tests/*_doctest_log.txt /tmp/log.* + trickops-tests-rockylinux9: + name: Unit Tests RockyLinux9 + runs-on: ubuntu-22.04 + container: rockylinux:9 + steps: + - uses: actions/checkout@master + - name: install dependencies + # Note that perl is for trick-gte which TrickOps runs and qt and everything after it is for koviz + run: | + dnf install -y git python3-devel which perl perl-Digest-MD5 qt5-qtbase-devel bison clang flex make gcc gcc-c++ wget + - name: create virtual environment + run: | + cd share/trick/trickops/ + python3 -m venv .venv && source .venv/bin/activate && pip3 install -r requirements.txt + - name: get and build koviz + run: | + cd /tmp/ && wget -q https://github.com/nasa/koviz/archive/refs/heads/master.zip && unzip master.zip + cd /tmp/koviz-master/ && qmake-qt5 && make + - name: run unit and doc tests + run: | + cd share/trick/trickops/tests/ + source ../.venv/bin/activate + export PATH="/tmp/koviz-master/bin:${PATH}" + ./run_tests.py + - uses: actions/upload-artifact@v4 + if: ${{ always() }} + with: + name: doctests_${{ github.run_id }}_${{ github.job }} + path: | + share/trick/trickops/tests/*_doctest_log.txt + /tmp/log.* + # TODO: ExampleWorkflow.py is not included here because it needs a built Trick # to function correctly and I don't want to duplicate the Trick build testing # here to provide testing of what is essentially an example provided for