Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
name: "CodeQL"

on:
workflow_dispatch:
push:
branches: [ main ]
pull_request:
Expand All @@ -38,11 +39,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,10 +54,10 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
#- name: Autobuild
# uses: github/codeql-action/autobuild@v2
# uses: github/codeql-action/autobuild@v3
- if: matrix.language == 'cpp' || matrix.language == 'csharp'
name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -72,4 +73,4 @@ jobs:
sh build.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
Binary file not shown.
Binary file not shown.
14 changes: 10 additions & 4 deletions .github/workflows/junit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '11'

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Runs a single command using the runners shell
- name: build project with tests
Expand All @@ -40,12 +40,18 @@ jobs:
# Runs a single command using the runners shell
- name: run JUnit tests
run: |
CP_TEST="./SystaRESTServer/bin"
for jarfile in ./SystaRESTServer/lib/*.jar; do
CP_TEST="$CP_TEST:$jarfile"
done
ls -al ./SystaRESTServer/bin/
java -jar .github/workflows/junit-platform-console-standalone-1.8.1.jar -cp ./SystaRESTServer/bin/ --scan-classpath -reports-dir='junit-reports/'
echo "Searching for data00_09_00.txt..."
find / -name 'data00_09_00.txt' 2>/dev/null || echo "File not found"
java -jar .github/workflows/junit-platform-console-standalone-1.13.4.jar -cp "$CP_TEST" --scan-classpath -reports-dir='junit-reports/'

# Publish the test results
- name: Publish Test Report
uses: mikepenz/action-junit-report@v3
uses: mikepenz/action-junit-report@v5
if: always() # always run even if the previous step fails
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Pylint

# Controls when the workflow will run
on:
workflow_dispatch:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
Expand All @@ -15,9 +16,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Run scc
id: scc
#get the action from iryanbell's repo
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Shellcheck

# Controls when the workflow will run
on:
workflow_dispatch:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
Expand All @@ -15,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
uses: ludeeus/action-shellcheck@2.0.0
env:
SHELLCHECK_OPTS: -e SC1091

Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ class SystaRESTAPITest extends JerseyTest {
// do not name this setup()
@BeforeAll // fix incompatibility with JUnit5
public static void initializeTestData() { // Made static as @BeforeAll for non-PER_CLASS lifecycle requires it
//String testDir = SystaRESTAPITest.class.getClass().getResource(".").getPath();
// TODO improve path handling of tests
String testDir = System.getProperty("user.dir") + "/bin/" + SystaRESTAPITest.class.getPackageName().replace('.', '/') + "/";
String testDir = this.getClass().getResource(".").getPath();
// TODO improve path handling of tests
//String testDir = System.getProperty("user.dir") + "SystaRESTServer/bin/" + SystaRESTAPITest.class.getPackageName().replace('.', '/') + "/";
String[] TEST_DATA_FILES = {
testDir + "data00_09_00.txt", // IDX_DATA00_09_00
testDir + "data01_09_00.txt", // IDX_DATA01_09_00
Expand Down