luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1998 from antmicro/umarcor/organise 

ci: organise
This commit is contained in:
Tomasz Michalak 2022-11-24 17:48:06 +01:00 committed by GitHub
parent 3cc35bb3bb 84cfc71af0
commit 536f8824a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.github/check_license.sh → .github/scripts/check_license.sh vendored
View File

0
.github/check_python_scripts.sh → .github/scripts/check_python_scripts.sh vendored
View File

93
.github/workflows/scripts/db.sh → .github/scripts/db.sh vendored
View File

@ -9,50 +9,51 @@
set -e set -e
source $(dirname "$0")/hostinfo.sh echo '::group::Host Environment'
export
echo '::endgroup::'
echo '::group::Host CPU'
export CORES=$(nproc --all)
echo "Cores: $CORES"
echo echo
echo "=======================================" echo "Memory"
echo "Creating Vivado Symbolic Link" echo "----------------------------------------"
echo "---------------------------------------" cat /proc/meminfo
echo "----------------------------------------"
export MEM_GB=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo)/(1024*1024)))
echo "Total Memory (GB): $MEM_GB"
echo '::endgroup::'
# Approx memory per grid process
export MEM_PER_RUN=8
export MAX_GRID_CPU=$(($MEM_GB/$MEM_PER_RUN))
export MAX_VIVADO_PROCESS=$(($MEM_GB/$MEM_PER_RUN))
echo '::group::Source Vivado settings'
ls /opt/Xilinx/Vivado ls /opt/Xilinx/Vivado
source /opt/Xilinx/Vivado/2017.2/settings64.sh source /opt/Xilinx/Vivado/2017.2/settings64.sh
vivado -version vivado -version
echo '::endgroup::'
echo echo '::group::Downloading current database'
echo "========================================" script --return --flush --command "./download-latest-db.sh" -
echo "Downloading current database" echo '::endgroup::'
echo "----------------------------------------"
(
script --return --flush --command "./download-latest-db.sh" -
)
echo "----------------------------------------"
echo echo '::group::Preparing database'
echo "========================================" make db-prepare-${XRAY_SETTINGS}
echo "Preparing database" echo '::endgroup::'
echo "----------------------------------------"
(
make db-prepare-${XRAY_SETTINGS}
)
echo "----------------------------------------"
source settings/$XRAY_SETTINGS.sh source settings/$XRAY_SETTINGS.sh
echo echo '::group::Cleaning out current database'
echo "========================================"
echo "Cleaning out current database"
echo "----------------------------------------"
( (
cd database cd database
make clean-${XRAY_SETTINGS}-db make clean-${XRAY_SETTINGS}-db
) )
echo "----------------------------------------" echo '::endgroup::'
echo echo '::group::Running Database build'
echo "========================================"
echo "Running Database build"
echo "----------------------------------------"
( (
# Output which fuzzers we are going to run # Output which fuzzers we are going to run
echo "make --dry-run" echo "make --dry-run"
@ -86,7 +87,7 @@ echo "----------------------------------------"
exit $DATABASE_RET exit $DATABASE_RET
fi fi
) )
echo "----------------------------------------" echo '::endgroup::'
# Format the database # Format the database
make db-format-${XRAY_SETTINGS} make db-format-${XRAY_SETTINGS}
@ -94,10 +95,7 @@ make db-format-${XRAY_SETTINGS}
make db-info make db-info
# Output if the database has differences # Output if the database has differences
echo echo '::group::Database Differences'
echo "========================================"
echo " Database Differences"
echo "----------------------------------------"
( (
cd database cd database
# Update the index with any new files # Update the index with any new files
@ -109,7 +107,6 @@ echo "----------------------------------------"
# Output what git status # Output what git status
echo echo
echo "----------------------------------------"
echo " Database Status" echo " Database Status"
echo "----------------------------------------" echo "----------------------------------------"
git status git status
@ -118,14 +115,12 @@ echo "----------------------------------------"
# Output a summary of how the files have changed # Output a summary of how the files have changed
echo echo
echo "----------------------------------------"
echo " Database Diff Summary" echo " Database Diff Summary"
echo "----------------------------------------" echo "----------------------------------------"
git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master git diff --stat --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
# Save the diff to be uploaded as an artifact # Save the diff to be uploaded as an artifact
echo echo
echo "----------------------------------------"
echo " Saving diff output" echo " Saving diff output"
echo "----------------------------------------" echo "----------------------------------------"
# Patch file # Patch file
@ -137,26 +132,22 @@ echo "----------------------------------------"
DIFF_LINES="$(wc -l diff.patch | sed -e's/ .*$//')" DIFF_LINES="$(wc -l diff.patch | sed -e's/ .*$//')"
if [ $DIFF_LINES -gt $MAX_DIFF_LINES ]; then if [ $DIFF_LINES -gt $MAX_DIFF_LINES ]; then
echo echo
echo "----------------------------------------"
echo " Database Diff" echo " Database Diff"
echo "----------------------------------------" echo "----------------------------------------"
echo "diff has $DIFF_LINES lines which is too large to display!" echo "diff has $DIFF_LINES lines which is too large to display!"
echo echo
echo "----------------------------------------"
echo " Generating pretty diff output" echo " Generating pretty diff output"
echo "----------------------------------------" echo "----------------------------------------"
echo "diff has $DIFF_LINES lines which is too large for HTML output!" echo "diff has $DIFF_LINES lines which is too large for HTML output!"
else else
# Output the actually diff # Output the actually diff
echo echo
echo "----------------------------------------"
echo " Database Diff" echo " Database Diff"
echo "----------------------------------------" echo "----------------------------------------"
git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master git diff --color --irreversible-delete --find-renames --find-copies --ignore-all-space origin/master
echo echo
echo "----------------------------------------"
echo " Generating pretty diff output" echo " Generating pretty diff output"
echo "----------------------------------------" echo "----------------------------------------"
( (
@ -177,7 +168,7 @@ echo "----------------------------------------"
) || true ) || true
fi fi
) )
echo "----------------------------------------" echo '::endgroup::'
# Check the database and fail if it is broken. # Check the database and fail if it is broken.
set -x +e set -x +e
@ -185,22 +176,17 @@ make db-check-${XRAY_SETTINGS}
CHECK_RET=$? CHECK_RET=$?
set +x -e set +x -e
echo echo '::group::Testing HTML generation'
echo "========================================"
echo " Testing HTML generation"
echo "----------------------------------------"
( (
cd htmlgen cd htmlgen
source htmlgen.sh $XRAY_SETTINGS source htmlgen.sh $XRAY_SETTINGS
) )
echo '::endgroup::'
# If we get here, then all the fuzzers completed fine. Hence we are # If we get here, then all the fuzzers completed fine. Hence we are
# going to assume we don't want to keep all the build / logs / etc (as # going to assume we don't want to keep all the build / logs / etc (as
# they are quite large). Thus do a clean to get rid of them. # they are quite large). Thus do a clean to get rid of them.
echo echo '::group::Cleaning up after success'
echo "========================================"
echo " Cleaning up after success"
echo "----------------------------------------"
( (
cd fuzzers cd fuzzers
echo echo
@ -208,11 +194,10 @@ echo "----------------------------------------"
make clean_fuzzers make clean_fuzzers
make clean_piplists make clean_piplists
) )
echo "----------------------------------------" echo '::endgroup::'
echo "========================================" echo '::group::Final disk space after cleanup'
echo " Final disk space after cleanup"
echo "----------------------------------------"
du -sh du -sh
echo '::endgroup::'
exit $CHECK_RET exit $CHECK_RET

0
.github/update-contributing.py → .github/scripts/update-contributing.py vendored
View File

0
.github/workflows/scripts/xilinx.sh → .github/scripts/xilinx.sh vendored
View File

4
.github/workflows/Pipeline.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
- name: Xilinx Setup - name: Xilinx Setup
run: | run: |
git config --global --add safe.directory /root/prjxray/prjxray git config --global --add safe.directory /root/prjxray/prjxray
.github/workflows/scripts/xilinx.sh .github/scripts/xilinx.sh
env: env:
USE_LICENSE_SERVER: "true" USE_LICENSE_SERVER: "true"
XRAY_SETTINGS: ${{ matrix.family }} XRAY_SETTINGS: ${{ matrix.family }}
@ -74,7 +74,7 @@ jobs:
run: make env --output-sync=target --warn-undefined-variables run: make env --output-sync=target --warn-undefined-variables
- name: Run Test - name: Run Test
run: .github/workflows/scripts/db.sh run: .github/scripts/db.sh
env: env:
XRAY_SETTINGS: ${{ matrix.family }} XRAY_SETTINGS: ${{ matrix.family }}

36
.github/workflows/scripts/hostinfo.sh vendored
View File

@ -1,36 +0,0 @@
#!/bin/bash
# Copyright (C) 2017-2020 The Project X-Ray Authors.
#
# Use of this source code is governed by a ISC-style
# license that can be found in the LICENSE file or at
# https://opensource.org/licenses/ISC
#
# SPDX-License-Identifier: ISC
set -e
echo
echo "========================================"
echo "Host Environment"
echo "----------------------------------------"
export
echo "----------------------------------------"
echo
echo "========================================"
echo "Host CPU"
echo "----------------------------------------"
export CORES=$(nproc --all)
echo "Cores: $CORES"
echo
echo "Memory"
echo "----------------------------------------"
cat /proc/meminfo
echo "----------------------------------------"
export MEM_GB=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo)/(1024*1024)))
echo "Total Memory (GB): $MEM_GB"
# Approx memory per grid process
export MEM_PER_RUN=8
export MAX_GRID_CPU=$(($MEM_GB/$MEM_PER_RUN))
export MAX_VIVADO_PROCESS=$(($MEM_GB/$MEM_PER_RUN))

6
Makefile
View File

@ -88,7 +88,7 @@ format-cpp:
find . -name \*.h $(FORMAT_EXCLUDE) -print0 | xargs -0 -P $$(nproc) ${CLANG_FORMAT} -style=file -i find . -name \*.h $(FORMAT_EXCLUDE) -print0 | xargs -0 -P $$(nproc) ${CLANG_FORMAT} -style=file -i
format-docs: format-docs:
./.github/update-contributing.py ./.github/scripts/update-contributing.py
PYTHON_FORMAT ?= yapf PYTHON_FORMAT ?= yapf
format-py: format-py:
@ -128,8 +128,8 @@ format: format-cpp format-docs format-py format-tcl format-trailing-ws
.PHONY: format format-cpp format-py format-tcl format-trailing-ws .PHONY: format format-cpp format-py format-tcl format-trailing-ws
check-license: check-license:
@./.github/check_license.sh @./.github/scripts/check_license.sh
@./.github/check_python_scripts.sh @./.github/scripts/check_python_scripts.sh
.PHONY: check-license .PHONY: check-license