Merge remote-tracking branch 'origin/master' into donttrythisathome

2025-03-16 17:15:19 +00:00 · 2025-01-14 09:50:32 -06:00 · 2025-01-14 09:50:32 -06:00 · bcfc23816e
commit bcfc23816e
parent a75d420541 e252513f7d
14 changed files with 16 additions and 16 deletions
--- a/.github/workflows/report_linux_py2.yml
+++ b/.github/workflows/report_linux_py2.yml
@ -20,7 +20,7 @@ jobs:

    runs-on: ubuntu-latest
    steps:
-    - uses: dorny/test-reporter@v1
+    - uses: dorny/test-reporter@v4
      with:
        artifact: Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # artifact name
        name: Results_Trick_${{matrix.cfg.os}}${{matrix.cfg.tag}}_py${{matrix.python}} # Name of the check run which will be created
--- a/.github/workflows/test_linux.yml
+++ b/.github/workflows/test_linux.yml
@ -146,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}}
--- a/.github/workflows/test_macos.yml
+++ b/.github/workflows/test_macos.yml
@ -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
--- a/.github/workflows/trickops.yml
+++ b/.github/workflows/trickops.yml
@ -63,7 +63,7 @@ jobs:
          source ../.venv/bin/activate
          export PATH="/tmp/koviz-master/bin:${PATH}"
          ./run_tests.py
-      - uses: actions/upload-artifact@v3.0.0
+      - uses: actions/upload-artifact@v4
        if: ${{ always() }}
        with:
          name: doctests
--- a/README.md
+++ b/README.md
@ -8,13 +8,13 @@

 <p align=center>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3ALinux">
-<img src="https://github.com/nasa/trick/workflows/Linux/badge.svg?branch=master" alt="Linux" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_linux.yml/badge.svg?branch=master" alt="Linux" height=30px>
 </a>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3AmacOS">
-<img src="https://github.com/nasa/trick/workflows/macOS/badge.svg?branch=master" alt="macOS" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_macos.yml/badge.svg?branch=master" alt="macOS" height=30px>
 </a>
 <a href="https://github.com/nasa/trick/actions?query=workflow%3A32-bit">
-<img src="https://github.com/nasa/trick/workflows/32-bit/badge.svg?branch=master" alt="32-bit" height=30px>
+<img src="https://github.com/nasa/trick/actions/workflows/test_32_oracle.yml/badge.svg?branch=master" alt="32-bit" height=30px>
 </a>
 </p>

--- a/trick_source/data_products/DPX/APPS/FXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/FXPLOT/makefile
@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++

 DPX_DIR = ../..
--- a/trick_source/data_products/DPX/APPS/GXPLOT/makefile
+++ b/trick_source/data_products/DPX/APPS/GXPLOT/makefile
@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++

 DPX_DIR = ../..
--- a/trick_source/data_products/DPX/DPC/makefile
+++ b/trick_source/data_products/DPX/DPC/makefile
@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++

 DPX_DIR  = ..
--- a/trick_source/data_products/DPX/DPM/makefile
+++ b/trick_source/data_products/DPX/DPM/makefile
@ -2,7 +2,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++

 DPX_DIR = ..
--- a/trick_source/data_products/EQParse/makefile
+++ b/trick_source/data_products/EQParse/makefile
@ -1,7 +1,7 @@

 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

-CC        = cc
+CC        = gcc

 OBJ_DIR    = object_${TRICK_HOST_CPU}
 LIBDIR    = ../lib_${TRICK_HOST_CPU}
--- a/trick_source/data_products/units/makefile
+++ b/trick_source/data_products/units/makefile
@ -1,7 +1,7 @@

 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

-CC  = cc
+CC  = gcc
 CPP = c++

 ifndef TRICK_HOST_CPU
--- a/trick_source/sim_services/DataTypes/makefile
+++ b/trick_source/sim_services/DataTypes/makefile
@ -1,6 +1,6 @@

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++


--- a/trick_source/trick_utils/SAIntegrator/makefile
+++ b/trick_source/trick_utils/SAIntegrator/makefile
@ -1,6 +1,6 @@

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++

 CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
--- a/trick_source/web/CivetServer/makefile
+++ b/trick_source/web/CivetServer/makefile
@ -1,7 +1,7 @@
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common

 RM = rm -rf
-CC = cc
+CC = gcc
 CPP = c++
 CURL = curl
 MV = mv