Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dacelib/dace
Browse files Browse the repository at this point in the history
  • Loading branch information
zhjsun committed Oct 7, 2023
2 parents b501f67 + df6901c commit a419100
Show file tree
Hide file tree
Showing 37 changed files with 2,092 additions and 1,849 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# 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: '36 14 4 * 1-5'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'cpp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# 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.

# 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#, 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

# ℹ️ 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}}"
32 changes: 16 additions & 16 deletions ArchLinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ md5sums=('SKIP')
# a description of each element in the source array.

pkgver() {
cd "$srcdir/${pkgname%-git}"
cd "$srcdir/${pkgname%-git}"

# The examples below are not absolute and need to be adapted to each repo. The
# primary goal is to generate version numbers that will increase according to
Expand All @@ -40,43 +40,43 @@ pkgver() {
# are not available, is recommended.

# Bazaar
# printf "r%s" "$(bzr revno)"
# printf "r%s" "$(bzr revno)"

# Git, tags available
# printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
# printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"

# Git, no tags available
# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"

# Mercurial
# printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
# printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)"

# Subversion
# printf "r%s" "$(svnversion | tr -d 'A-z')"
# printf "r%s" "$(svnversion | tr -d 'A-z')"

( set -o pipefail
( set -o pipefail
git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
)
}

prepare() {
cd "$srcdir/${pkgname%-git}"
mkdir Release
cd "$srcdir/${pkgname%-git}"
mkdir Release
}

build() {
cd "$srcdir/${pkgname%-git}/Release"
cmake ../
make
cd "$srcdir/${pkgname%-git}/Release"
cmake ../
make
}

check() {
cd "$srcdir/${pkgname%-git}/Release"
#make -k check
cd "$srcdir/${pkgname%-git}/Release"
#make -k check
}

package() {
cd "$srcdir/${pkgname%-git}/Release"
make DESTDIR="$pkgdir/" install
cd "$srcdir/${pkgname%-git}/Release"
make DESTDIR="$pkgdir/" install
}
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.4)
cmake_minimum_required (VERSION 3.0.0)
include(CMakeDependentOption)

# since MacOS 10.14 (XCode 10.0), default includes are no longer installed to /usr/include or /usr/local/include
Expand Down Expand Up @@ -165,7 +165,7 @@ if(WIN32)
Delete \\\"$SYSDIR\\\\dace.dll\\\"
")
unset(CPACK_PACKAGING_INSTALL_PREFIX) # replace by whatever it needs to be
unset(CPACK_PACKAGING_INSTALL_PREFIX) # replace by whatever it needs to be
elseif(APPLE)
set(CPACK_GENERATOR "TGZ;productbuild")
set(CPACK_PACKAGE_VENDOR "DACEDevelopmentGroup") # no spaces allowed for packagebuild
Expand Down
Loading

0 comments on commit a419100

Please sign in to comment.