mirror of
https://github.com/nasa/trick.git
synced 2025-03-14 08:16:31 +00:00
Merge remote-tracking branch 'origin/master' into donttrythisathome
This commit is contained in:
commit
bcfc23816e
2
.github/workflows/report_linux_py2.yml
vendored
2
.github/workflows/report_linux_py2.yml
vendored
@ -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
|
||||
|
2
.github/workflows/test_linux.yml
vendored
2
.github/workflows/test_linux.yml
vendored
@ -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}}
|
||||
|
2
.github/workflows/test_macos.yml
vendored
2
.github/workflows/test_macos.yml
vendored
@ -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
|
||||
|
2
.github/workflows/trickops.yml
vendored
2
.github/workflows/trickops.yml
vendored
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
DPX_DIR = ../..
|
||||
|
@ -2,7 +2,7 @@
|
||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
DPX_DIR = ../..
|
||||
|
@ -2,7 +2,7 @@
|
||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
DPX_DIR = ..
|
||||
|
@ -2,7 +2,7 @@
|
||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
DPX_DIR = ..
|
||||
|
@ -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}
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
||||
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
ifndef TRICK_HOST_CPU
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
RM = rm -rf
|
||||
CC = cc
|
||||
CC = gcc
|
||||
CPP = c++
|
||||
|
||||
CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user