Skip to content

Commit

Permalink
Merge branch 'aous72:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
osamu620 authored Jun 27, 2024
2 parents 79f7d39 + 4b964c1 commit e376d5c
Show file tree
Hide file tree
Showing 89 changed files with 11,940 additions and 3,533 deletions.
62 changes: 53 additions & 9 deletions .github/workflows/ccp-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,52 @@ on: push

jobs:
build:
name: main build for Unix-like
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-20.04, ubuntu-latest]
include: [
{ system: MacOS, runner: macos-latest },
{ system: Ubuntu-20, runner: ubuntu-20.04 },
{ system: Ubuntu-latest, runner: ubuntu-latest },
]
name: ${{ matrix.system }} Build
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cmake
run: cmake ..
run: cmake -DOJPH_BUILD_STREAM_EXPAND=ON ..
working-directory: build
- name: build
run: make
working-directory: build

build_windows:
strategy:
matrix:
include: [
{ system: Windows, runner: windows-latest },
]
name: ${{ matrix.system }} Build
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
- name: cmake
run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_STREAM_EXPAND=ON ..
working-directory: build
- name: build
run: cmake --build . --config Release
working-directory: build

test:
name: tests on Linux and MacOS
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest]
include: [
{ system: MacOS, runner: macos-latest },
{ system: Ubuntu-latest, runner: ubuntu-latest },
]
name: ${{ matrix.system }} Test
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cmake
run: cmake -DOJPH_BUILD_TESTS=yes ..
working-directory: build
Expand All @@ -36,6 +60,26 @@ jobs:
- name: test
run: ctest --output-on-failure
working-directory: build

test_windows:
strategy:
matrix:
include: [
{ system: Windows, runner: windows-latest },
]
name: ${{ matrix.system }} Test
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
- name: cmake
run: cmake -G "Visual Studio 17 2022" -A x64 -DOJPH_ENABLE_TIFF_SUPPORT=OFF -DOJPH_BUILD_TESTS=ON ..
working-directory: build
- name: build
run: cmake --build . --config Release
working-directory: build
- name: test
run: ctest --output-on-failure -C Release
working-directory: build

#jobs:
# ci:
Expand Down
82 changes: 82 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
schedule:
- cron: '39 20 * * 2'

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'cpp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
mytest/*
others/*
lib/*

.vscode
build.sh
Loading

0 comments on commit e376d5c

Please sign in to comment.