From 13ab4c065e9004db69ce1a4eac922c65a81cd06e Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Mon, 6 Jan 2025 17:01:36 -0600 Subject: [PATCH 1/6] Updated README.md Changed 32-bit status image to 32-bit%20Oracle as 32-bit was with centos7 that is no longer supported. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b86c5d5e..ad716034 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ macOS -32-bit +32-bit

From 80063bf498efef2bb0f2d31a8197b476aa4ef79c Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Tue, 7 Jan 2025 10:37:23 -0600 Subject: [PATCH 2/6] Updated to Github actions v4 as Github actions v3 will be closing down by 1/30/25. (#1823) --- .github/workflows/report_linux_py2.yml | 2 +- .github/workflows/test_linux.yml | 2 +- .github/workflows/test_macos.yml | 2 +- .github/workflows/trickops.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/report_linux_py2.yml b/.github/workflows/report_linux_py2.yml index 952e4a2a..74b71e0a 100644 --- 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 diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 17e587a7..eb07ed2e 100644 --- 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}} diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml index d232eadf..1a365f79 100644 --- 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 diff --git a/.github/workflows/trickops.yml b/.github/workflows/trickops.yml index bd20eac5..ff6878c2 100644 --- 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 From 0695391bac3f6aae0e8ef6e2272e3935250dacf7 Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Tue, 7 Jan 2025 10:42:56 -0600 Subject: [PATCH 3/6] 1811 dont override users cc and cpp env for data products (#1819) * Don't override the CC and C++ environment variables Fixes an issue where some makefiles override the user's CC and C++ environment variables. * Restore test makefiles * Test to change from CC = cc to CC = gcc for only needed files. * Restore the whitespaces to their original state before the update in order to show the necessary file changes for the PR. --------- Co-authored-by: Nino Tarantino --- trick_source/data_products/DPX/APPS/FXPLOT/makefile | 2 +- trick_source/data_products/DPX/APPS/GXPLOT/makefile | 2 +- trick_source/data_products/DPX/DPC/makefile | 2 +- trick_source/data_products/DPX/DPM/makefile | 2 +- trick_source/data_products/EQParse/makefile | 2 +- trick_source/data_products/units/makefile | 2 +- trick_source/sim_services/DataTypes/makefile | 2 +- trick_source/trick_utils/SAIntegrator/makefile | 2 +- trick_source/web/CivetServer/makefile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/trick_source/data_products/DPX/APPS/FXPLOT/makefile b/trick_source/data_products/DPX/APPS/FXPLOT/makefile index b3bb90b1..480cc1ec 100644 --- 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 index e23337c5..e36352be 100644 --- 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 index 24e34a72..14e3984a 100644 --- 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 index 2b67ccd1..a6fb2c76 100644 --- 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 index 6a5cc3bd..3887d161 100644 --- 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 index 20f28d6c..42d7ac90 100644 --- 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 index b5050c78..c18d9b8e 100644 --- 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 index cdd6eaeb..98506b78 100644 --- 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 index fce4065f..11db671d 100644 --- 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 From 7d0015310294c41e6465c2170de684b01cd964a1 Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Tue, 7 Jan 2025 13:46:41 -0600 Subject: [PATCH 4/6] Update README.md to show GitHub action badge correctly. The format of the badge url needs updating. For example, Before: https://github.com/nasa/trick/workflows/Linux/badge.svg?branch=master After: https://github.com/nasa/trick/actions/workflows/test_linux.yml/badge.svg?branch=master --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad716034..336b1a4e 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@

-Linux +Linux -macOS +macOS -32-bit +32-bit

From 159e7aafc2defe7fc604246e58ece3fcb34b2106 Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Thu, 9 Jan 2025 09:16:43 -0600 Subject: [PATCH 5/6] Update README.md to display a custom name next to the badge without changing the YAML file. test_32_oracle.yml has name "32-bit Oracle" for the run in the file. Testing this update to display just "32-bit" next to the badge without changing test_32_oracle.yml so it is the same as before. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 336b1a4e..35e5db32 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ macOS -32-bit +32-bit32-bit

From e252513f7daa04720f3d12e7ff9ae9bd1fe212cb Mon Sep 17 00:00:00 2001 From: Hong Chen Date: Thu, 9 Jan 2025 09:37:29 -0600 Subject: [PATCH 6/6] Revert "Update README.md to display a custom name next to the badge without changing the YAML file." This reverts commit 159e7aafc2defe7fc604246e58ece3fcb34b2106. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 35e5db32..336b1a4e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ macOS -32-bit32-bit +32-bit