Merge branch 'master' into 1821-action-required-github-actions-v4-update

nasa · Jan 7, 2025 · e806fea · e806fea
2 parents 5ea5393 + 7d00153
commit e806fea
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git 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>
 

diff --git 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 = ../..

diff --git 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 = ../..

diff --git 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  = ..

diff --git 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 = ..

diff --git 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}

diff --git 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

diff --git 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++
 
 

diff --git 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}

diff --git 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