Skip to content

Commit a908134

Browse files
committed
Merge remote-tracking branch 'origin/master' into FramePerf
2 parents 87dc192 + b2ade31 commit a908134

File tree

104 files changed

+3332
-891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3332
-891
lines changed

.github/workflows/alt_linux_distros.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
- name: Install GTest
142142
run: ${{matrix.install_gtest}}
143143
- name: Checkout repository
144-
uses: actions/checkout@v3
144+
uses: actions/checkout@v4
145145
- name: Configure Trick
146146
run: |
147147
export MAKEFLAGS=-j`nproc`

.github/workflows/code_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
dnf install -y gtest-devel gmock-devel
3333
3434
- name: Checkout repository
35-
uses: actions/checkout@master
35+
uses: actions/checkout@v4
3636

3737
- name: Configure Trick
3838
run: |

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
container: docker://nasatrick/${{matrix.container}}:latest
1111
strategy:
1212
matrix:
13-
container: [trick_centos7, trick_centos8, trick_ubuntu1804]
13+
container: [trick_ubuntu1804]
1414
steps:
1515
- name: run tests
1616
run: |

.github/workflows/python_tests_32.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

.github/workflows/python_tests_linux.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
- { os: ubuntu, tag: 18.04, arch: debian } # EOL April 2023
2525
- { os: ubuntu, tag: 20.04, arch: debian } # EOL April 2025
2626
- { os: debian, tag: 10, arch: debian } # EOL 2024
27-
- { os: centos, tag: 7, arch: rhel } # EOL June 2024
28-
- { os: centos, tag: latest, arch: rhel } # 8 as of April 2020
2927
# - { os: fedora, tag: latest, arch: rhel } # 31 as of April 2020
3028
# - { os: fedora, tag: 33, arch: rhel } # feeling confident?
3129
# - { os: fedora, tag: rawhide, arch: rhel } # for thrill-seekers only
@@ -102,13 +100,6 @@ jobs:
102100
- cfg: { os: debian }
103101
os_deps: >-
104102
openjdk-11-jdk
105-
#-------- CentOS Only Dependencies ----------------
106-
- cfg: { os: centos }
107-
pkg_mgr: yum
108-
conf_pkg: yum -y install epel-release && yum -y update
109-
os_deps: >-
110-
libX11-devel
111-
libXt-devel
112103
#-------- Fedora Only Dependencies ----------------
113104
# - cfg: { os: fedora }
114105
# pkg_mgr: dnf
@@ -123,21 +114,6 @@ jobs:
123114
install_gtest: cd /usr/src/gtest && cmake . && make && cp lib/libgtest* /usr/lib/
124115
tag_deps: >-
125116
python3.8-dev
126-
- cfg: { os: centos, tag: 7 }
127-
tag_deps: >-
128-
swig3
129-
python-devel
130-
- cfg: { os: centos, tag: latest }
131-
pkg_mgr: dnf
132-
conf_pkg: >
133-
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-* &&
134-
dnf -y install epel-release &&
135-
dnf -y update &&
136-
dnf install -y 'dnf-command(config-manager)' &&
137-
dnf config-manager --enable powertools
138-
tag_deps: >-
139-
swig
140-
python3-devel diffutils
141117
#-------- Job definition ----------------
142118
runs-on: ubuntu-18.04
143119
container: docker://${{matrix.cfg.os}}:${{matrix.cfg.tag}}
@@ -164,7 +140,7 @@ jobs:
164140
- name: Install GTest
165141
run: ${{matrix.install_gtest}}
166142
- name: Checkout repository
167-
uses: actions/checkout@master
143+
uses: actions/checkout@v4
168144
- name: Info after checkout
169145
run: |
170146
pwd

.github/workflows/python_tests_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: macos-latest
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@master
22+
uses: actions/checkout@v4
2323
- name: Install python
2424
run: |
2525
brew install python

.github/workflows/report_linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
cfg:
1414
#-------- Operating Systems ----------------
1515
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
16-
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
1716
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
1817
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
1918
python: [3]

.github/workflows/report_linux_py2.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
cfg:
1414
#-------- Operating Systems ----------------
1515
- { os: ubuntu, tag: 22.04, arch: debian, arch_ver: 12 }
16-
- { os: centos, tag: 7, arch: rhel, arch_ver: 7 }
1716
- { os: rockylinux, tag: 8, arch: rhel, arch_ver: 8 }
1817
- { os: oraclelinux, tag: 8, arch: rhel, arch_ver: 8 }
1918
python: [2]

.github/workflows/test_32.yml

Lines changed: 0 additions & 69 deletions
This file was deleted.

.github/workflows/test_32_oracle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
make
5757
make install
5858
- name: Checkout repository
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060
- name: Build Trick
6161
run: |
6262
export CFLAGS="-m32"

0 commit comments

Comments
 (0)