Skip to content

Commit

Permalink
Merge branch 'key4hep:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
SwathiSasikumar authored Aug 9, 2024
2 parents cfe17d6 + 8632301 commit 1f02df9
Show file tree
Hide file tree
Showing 40 changed files with 1,887 additions and 1,123 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/downstream-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Do not edit this file, it will be overwritten!
# The template file can be found in
# https://github.com/key4hep/key4hep-actions/blob/main/workflows/downstream-build.yaml
name: downstream-build

on:
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
downstream-build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: key4hep/key4hep-actions/downstream-build@main
32 changes: 32 additions & 0 deletions .github/workflows/key4hep-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Do not edit this file, it will be overwritten!
# The template file can be found in
# https://github.com/key4hep/key4hep-actions/blob/main/workflows/key4hep-build.yaml
name: Key4hep build

on:
push:
branches:
- main
pull_request:
workflow_dispatch:
schedule:
- cron: '16 5 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
matrix:
build_type: ["release", "nightly"]
image: ["alma9", "ubuntu22"]
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: key4hep/key4hep-actions/key4hep-build@main
with:
build_type: ${{ matrix.build_type }}
image: ${{ matrix.image }}
32 changes: 0 additions & 32 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,6 @@ _deps
*.root
*.slcio
build/*
install/*
.vscode
*.pyc
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
rev: 'v0.8.8'
hooks:
- id: licenseheaders
args: ["-t", ".github/templates/apache-2.tmpl", "-y2014-2023",
args: ["-t", ".github/templates/apache-2.tmpl", "-y2014-2024",
"-o", "Key4hep-Project",
"-n", "Key4hep",
"-u", "https://key4hep.github.io/key4hep-doc/",
Expand Down
Loading

0 comments on commit 1f02df9

Please sign in to comment.