Skip to content

Commit

Permalink
Merge pull request #1894 from antmicro/umarcor/ci/dependabot
Browse files Browse the repository at this point in the history
ci: add Automerge; combine workflows
  • Loading branch information
kgugala authored Apr 8, 2022
2 parents 0d46012 + ce92a9c commit 0d34e72
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 57 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/Automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Automerge

on:
pull_request:
push:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:

jobs:


Pipeline:
if: ${{ !(github.event_name != 'pull_request' && github.actor == 'dependabot[bot]') }}
uses: ./.github/workflows/Pipeline.yml


Automerge:
needs: Pipeline
if: github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
name: Automerge dependabot PRs
permissions:
contents: write

steps:

- name: Auto-merge Dependabot PR
run: GITHUB_TOKEN='${{ github.token }}' gh pr merge '${{ github.event.pull_request.html_url }}' --squash
48 changes: 42 additions & 6 deletions .github/workflows/database.yml → .github/workflows/Pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
on:
pull_request:
push:
schedule:
- cron: '0 0 * * *'
name: Pipeline

name: Database
on:
workflow_call:

jobs:


BuildDatabase:
container: ubuntu:bionic

Expand Down Expand Up @@ -60,3 +59,40 @@ jobs:
**/fuzzers/*.tgz
**/database/${{ matrix.family }}/**"
Tests:
container: ubuntu:bionic

runs-on: [self-hosted, Linux, X64]

env:
ALLOW_ROOT: true

steps:

- uses: actions/checkout@v2
with:
submodules: recursive

- name: Install
run: |
apt update
apt install -y \
bash bison build-essential ca-certificates clang-format cmake psmisc \
colordiff coreutils git flex python3 python3-dev python3-venv xsltproc
- name: Build
run: make build --output-sync=target --warn-undefined-variables -j$(nproc)

- name: Environment
run: make env --output-sync=target --warn-undefined-variables

- name: Run Test
run: make test --output-sync=target --warn-undefined-variables

- uses: actions/upload-artifact@v2
if: ${{ always() }}
with:
path: |
**/results*.gz
**/plot_*.svg
46 changes: 0 additions & 46 deletions .github/workflows/tests.yml

This file was deleted.

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Project X-Ray

[![Documentation Status](https://readthedocs.org/projects/pyxray/badge/?version=latest)](http://prjxray.readthedocs.org/)
[![License](https://img.shields.io/github/license/f4pga/prjxray.svg)](https://github.com/f4pga/prjxray/blob/master/LICENSE)

![Tests](https://github.com/f4pga/prjxray/actions/workflows/tests.yml/badge.svg)
![Database Generation](https://github.com/f4pga/prjxray/actions/workflows/database.yml/badge.svg)
[![Documentation Status](https://img.shields.io/readthedocs/prjxray?longCache=true&style=flat-square&logo=ReadTheDocs&logoColor=fff)](http://prjxray.readthedocs.org/)
[![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)
![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)

Documenting the Xilinx 7-series bit-stream format.

Expand Down

0 comments on commit 0d34e72

Please sign in to comment.