Skip to content

Commit 0d34e72

Browse files
authored
Merge pull request #1894 from antmicro/umarcor/ci/dependabot
ci: add Automerge; combine workflows
2 parents 0d46012 + ce92a9c commit 0d34e72

File tree

4 files changed

+74
-57
lines changed

4 files changed

+74
-57
lines changed

.github/workflows/Automerge.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Automerge
2+
3+
on:
4+
pull_request:
5+
push:
6+
schedule:
7+
- cron: '0 0 * * *'
8+
workflow_dispatch:
9+
10+
jobs:
11+
12+
13+
Pipeline:
14+
if: ${{ !(github.event_name != 'pull_request' && github.actor == 'dependabot[bot]') }}
15+
uses: ./.github/workflows/Pipeline.yml
16+
17+
18+
Automerge:
19+
needs: Pipeline
20+
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
21+
runs-on: ubuntu-latest
22+
name: Automerge dependabot PRs
23+
permissions:
24+
contents: write
25+
26+
steps:
27+
28+
- name: Auto-merge Dependabot PR
29+
run: GITHUB_TOKEN='${{ github.token }}' gh pr merge '${{ github.event.pull_request.html_url }}' --squash
Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
on:
2-
pull_request:
3-
push:
4-
schedule:
5-
- cron: '0 0 * * *'
1+
name: Pipeline
62

7-
name: Database
3+
on:
4+
workflow_call:
85

96
jobs:
7+
8+
109
BuildDatabase:
1110
container: ubuntu:bionic
1211

@@ -60,3 +59,40 @@ jobs:
6059
**/fuzzers/*.tgz
6160
**/database/${{ matrix.family }}/**"
6261
62+
63+
Tests:
64+
container: ubuntu:bionic
65+
66+
runs-on: [self-hosted, Linux, X64]
67+
68+
env:
69+
ALLOW_ROOT: true
70+
71+
steps:
72+
73+
- uses: actions/checkout@v2
74+
with:
75+
submodules: recursive
76+
77+
- name: Install
78+
run: |
79+
apt update
80+
apt install -y \
81+
bash bison build-essential ca-certificates clang-format cmake psmisc \
82+
colordiff coreutils git flex python3 python3-dev python3-venv xsltproc
83+
84+
- name: Build
85+
run: make build --output-sync=target --warn-undefined-variables -j$(nproc)
86+
87+
- name: Environment
88+
run: make env --output-sync=target --warn-undefined-variables
89+
90+
- name: Run Test
91+
run: make test --output-sync=target --warn-undefined-variables
92+
93+
- uses: actions/upload-artifact@v2
94+
if: ${{ always() }}
95+
with:
96+
path: |
97+
**/results*.gz
98+
**/plot_*.svg

.github/workflows/tests.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# Project X-Ray
22

3-
[![Documentation Status](https://readthedocs.org/projects/pyxray/badge/?version=latest)](http://prjxray.readthedocs.org/)
4-
[![License](https://img.shields.io/github/license/f4pga/prjxray.svg)](https://github.com/f4pga/prjxray/blob/master/LICENSE)
5-
6-
![Tests](https://github.com/f4pga/prjxray/actions/workflows/tests.yml/badge.svg)
7-
![Database Generation](https://github.com/f4pga/prjxray/actions/workflows/database.yml/badge.svg)
3+
[![Documentation Status](https://img.shields.io/readthedocs/prjxray?longCache=true&style=flat-square&logo=ReadTheDocs&logoColor=fff)](http://prjxray.readthedocs.org/)
4+
[![License](https://img.shields.io/github/license/f4pga/prjxray.svg?longCache=true&style=flat-square&label=License)](https://github.com/f4pga/prjxray/blob/master/LICENSE)
5+
![GitHub Actions](https://img.shields.io/github/workflow/status/f4pga/prjxray/Automerge/master?longCache=true&style=flat-square&label=GHA&logo=Github%20Actions&logoColor=fff)
86

97
Documenting the Xilinx 7-series bit-stream format.
108

0 commit comments

Comments
 (0)