Skip to content

Commit

Permalink
Revert "test"
Browse files Browse the repository at this point in the history
This reverts commit 6458ef7.
  • Loading branch information
di-shi committed Mar 11, 2024
1 parent 6458ef7 commit a3ab297
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 70 deletions.
51 changes: 26 additions & 25 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: C/C++ CI

on:
push:
branches: [master]
branches: [ master ]
pull_request:
branches: [master]
branches: [ master ]
workflow_dispatch:

jobs:
Expand All @@ -14,28 +14,29 @@ jobs:
matrix:
os: [centos7, rhel8]
include:
- os: centos7
container: "centos:7"
- os: rhel8
container: "oraclelinux:8"
- os: centos7
container: 'centos:7'
- os: rhel8
container: 'oraclelinux:8'
container: ${{ matrix.container }}

steps:
- name: checkout for centos7
uses: actions/checkout@v4
if: ${{ matrix.os == 'centos7' }}
- name: checkout for rhel8
uses: actions/checkout@v4
if: ${{ matrix.os == 'rhel8' }}
- name: install dependencies
run: |
yum install -y epel-release
yum install -y make gcc-c++ openssl-devel utf8proc-devel
- name: make osptk
run: |
cd $GITHUB_WORKSPACE/src
make build
- name: make test_app
run: |
cd $GITHUB_WORKSPACE/test
make linux
- name: checkout for centos7
uses: actions/checkout@v3
if: ${{ matrix.os == 'centos7' }}
- name: checkout for rhel8
uses: actions/checkout@v4
if: ${{ matrix.os == 'rhel8' }}
- name: install dependencies
run: |
yum install -y epel-release
yum install -y make gcc-c++ openssl-devel utf8proc-devel
- name: make osptk
run: |
cd $GITHUB_WORKSPACE/src
make build
- name: make test_app
run: |
cd $GITHUB_WORKSPACE/test
make linux
90 changes: 45 additions & 45 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,69 +2,69 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [ master ]
pull_request:
branches: [master]
branches: [ master ]
schedule:
- cron: "28 21 * * 6"
- cron: '28 21 * * 6'
workflow_dispatch:

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
language: ["cpp"]
language: [ 'cpp' ]
os: [centos7, rhel8]
include:
- os: centos7
container: "centos:7"
- os: rhel8
container: "oraclelinux:8"
- os: centos7
container: 'centos:7'
- os: rhel8
container: 'oraclelinux:8'
container: ${{ matrix.container }}

steps:
- name: Checkout for centos7
uses: actions/checkout@v4
if: ${{ matrix.os == 'centos7' }}

- name: Checkout for rhel8
uses: actions/checkout@v4
if: ${{ matrix.os == 'rhel8' }}
- name: Checkout for centos7
uses: actions/checkout@v3
if: ${{ matrix.os == 'centos7' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL for centos7
uses: github/codeql-action/init@v3
if: ${{ matrix.os == 'centos7' }}
with:
queries: security-extended
languages: ${{ matrix.language }}
- name: Checkout for rhel8
uses: actions/checkout@v4
if: ${{ matrix.os == 'rhel8' }}

- name: Initialize CodeQL for rhel8
uses: github/codeql-action/init@v3
if: ${{ matrix.os == 'rhel8' }}
with:
queries: security-extended
languages: ${{ matrix.language }}
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL for centos7
uses: github/codeql-action/init@v2
if: ${{ matrix.os == 'centos7' }}
with:
queries: security-extended
languages: ${{ matrix.language }}

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
- name: Initialize CodeQL for rhel8
uses: github/codeql-action/init@v3
if: ${{ matrix.os == 'rhel8' }}
with:
queries: security-extended
languages: ${{ matrix.language }}

- name: Build osptoolkit
run: |
yum install -y epel-release
yum install -y make gcc-c++ openssl-devel utf8proc-devel
cd $GITHUB_WORKSPACE/src
make build
cd $GITHUB_WORKSPACE/test
make linux
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

- name: Perform CodeQL Analysis for centos7
uses: github/codeql-action/analyze@v3
if: ${{ matrix.os == 'centos7' }}
- name: Build osptoolkit
run: |
yum install -y epel-release
yum install -y make gcc-c++ openssl-devel utf8proc-devel
cd $GITHUB_WORKSPACE/src
make build
cd $GITHUB_WORKSPACE/test
make linux
- name: Perform CodeQL Analysis for centos7
uses: github/codeql-action/analyze@v2
if: ${{ matrix.os == 'centos7' }}

- name: Perform CodeQL Analysis for rhel8
uses: github/codeql-action/analyze@v3
if: ${{ matrix.os == 'rhel8' }}
- name: Perform CodeQL Analysis for rhel8
uses: github/codeql-action/analyze@v3
if: ${{ matrix.os == 'rhel8' }}

0 comments on commit a3ab297

Please sign in to comment.