Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into FramePerf
Browse files Browse the repository at this point in the history
  • Loading branch information
jmpenn committed Feb 10, 2025
2 parents 87dc192 + b2ade31 commit a908134
Show file tree
Hide file tree
Showing 104 changed files with 3,332 additions and 891 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/alt_linux_distros.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
dnf install -y gtest-devel gmock-devel
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Configure Trick
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
container: docker://nasatrick/${{matrix.container}}:latest
strategy:
matrix:
container: [trick_centos7, trick_centos8, trick_ubuntu1804]
container: [trick_ubuntu1804]
steps:
- name: run tests
run: |
Expand Down
86 changes: 0 additions & 86 deletions .github/workflows/python_tests_32.yml

This file was deleted.

26 changes: 1 addition & 25 deletions .github/workflows/python_tests_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
- { os: ubuntu, tag: 18.04, arch: debian } # EOL April 2023
- { os: ubuntu, tag: 20.04, arch: debian } # EOL April 2025
- { os: debian, tag: 10, arch: debian } # EOL 2024
- { os: centos, tag: 7, arch: rhel } # EOL June 2024
- { os: centos, tag: latest, arch: rhel } # 8 as of April 2020
# - { os: fedora, tag: latest, arch: rhel } # 31 as of April 2020
# - { os: fedora, tag: 33, arch: rhel } # feeling confident?
# - { os: fedora, tag: rawhide, arch: rhel } # for thrill-seekers only
Expand Down Expand Up @@ -102,13 +100,6 @@ jobs:
- cfg: { os: debian }
os_deps: >-
openjdk-11-jdk
#-------- CentOS Only Dependencies ----------------
- cfg: { os: centos }
pkg_mgr: yum
conf_pkg: yum -y install epel-release && yum -y update
os_deps: >-
libX11-devel
libXt-devel
#-------- Fedora Only Dependencies ----------------
# - cfg: { os: fedora }
# pkg_mgr: dnf
Expand All @@ -123,21 +114,6 @@ jobs:
install_gtest: cd /usr/src/gtest && cmake . && make && cp lib/libgtest* /usr/lib/
tag_deps: >-
python3.8-dev
- cfg: { os: centos, tag: 7 }
tag_deps: >-
swig3
python-devel
- cfg: { os: centos, tag: latest }
pkg_mgr: dnf
conf_pkg: >
sed -i -e "s|mirrorlist=|#mirrorlist=|g" -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-Linux-* &&
dnf -y install epel-release &&
dnf -y update &&
dnf install -y 'dnf-command(config-manager)' &&
dnf config-manager --enable powertools
tag_deps: >-
swig
python3-devel diffutils
#-------- Job definition ----------------
runs-on: ubuntu-18.04
container: docker://${{matrix.cfg.os}}:${{matrix.cfg.tag}}
Expand All @@ -164,7 +140,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Info after checkout
run: |
pwd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Install python
run: |
brew install python
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/report_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
cfg:
#-------- Operating Systems ----------------
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
python: [3]
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/report_linux_py2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
cfg:
#-------- Operating Systems ----------------
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
python: [2]
Expand Down
69 changes: 0 additions & 69 deletions .github/workflows/test_32.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test_32_oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
make
make install
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Trick
run: |
export CFLAGS="-m32"
Expand Down
29 changes: 2 additions & 27 deletions .github/workflows/test_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
cfg:
#-------- Operating Systems ----------------
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
python: [3]
Expand Down Expand Up @@ -95,30 +94,6 @@ jobs:
zlib-devel
python2-devel
python3-devel
#-------- RHEL 7-based Only Dependencies ----------------
- cfg: { arch: rhel, arch_ver: 7 }
pkg_mgr: yum
conf_pkg: |
sed -i -e "s|mirrorlist=|#mirrorlist=|g" -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-* &&
yum -y install epel-release
yum -y update
yum -y install wget
os_deps: >-
libX11-devel
libXt-devel
swig3
install_gtest: |
cd /tmp
wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz
tar xzvf release-1.8.0.tar.gz
cd /tmp/googletest-release-1.8.0/googletest
cmake .
make
make install
cd /tmp/googletest-release-1.8.0/googlemock
cmake .
make
make install
#-------- RHEL 8-based Only Dependencies ----------------
- cfg: { arch: rhel, arch_ver: 8 }
pkg_mgr: dnf
Expand Down Expand Up @@ -154,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
Expand All @@ -171,7 +146,7 @@ jobs:
python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_linux_py2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
cfg:
#-------- Operating Systems ----------------
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
python: [2]
Expand Down Expand Up @@ -130,7 +129,7 @@ jobs:
- name: Install GTest
run: ${{matrix.install_gtest}}
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v4
- name: Configure Trick
run: |
export MAKEFLAGS=-j`nproc`
Expand All @@ -146,7 +145,7 @@ jobs:
python3 -m venv .venv && . .venv/bin/activate && pip3 install -r requirements.txt
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: macos-13
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install gtest
run: |
brew install googletest
Expand All @@ -42,7 +42,7 @@ jobs:
export MAKEFLAGS=-j4
cd ../../../; make test
- name: Upload Tests
uses: actions/upload-artifact@v3.0.0
uses: actions/upload-artifact@v4
if: success() || failure() # run this step even if previous step failed
with:
name: Trick_macos
Expand Down
Loading

0 comments on commit a908134

Please sign in to comment.