Skip to content

Commit

Permalink
Merge pull request #3833 from balacij/main
Browse files Browse the repository at this point in the history
CI: Make sure to build trace graphs & minor cleanups
  • Loading branch information
JacquesCarette authored Jul 5, 2024
2 parents fd603d0 + 82b61a3 commit d3d569b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
18 changes: 11 additions & 7 deletions .github/workflows/Build.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
on:
push:
paths: [code/**]
paths: [code/**, .github/workflows/Build.yaml]
pull_request:
branches: main
paths: [code/**]
paths: [code/**, .github/workflows/Build.yaml]
workflow_dispatch:
name: Build
defaults:
Expand Down Expand Up @@ -46,6 +46,11 @@ jobs:
- name: "Install system requirements"
run: sudo apt-get install -y --fix-missing libgmp-dev python3 graphviz doxygen fonts-lmodern texlive-bibtex-extra texlive-latex-extra texlive-science texlive-xetex texlive-luatex g++ default-jdk mono-devel inkscape

- name: "Update PATH"
run: |
echo "$HOME/.local/bin" >> $GITHUB_PATH
echo "$HOME/.swift/usr/bin" >> $GITHUB_PATH
- name: "Install Stack"
uses: haskell-actions/setup@v2
with:
Expand All @@ -68,11 +73,6 @@ jobs:
- name: "Clean previous run"
run: make clean

- name: "Update PATH"
run: |
echo "$HOME/.local/bin" >> $GITHUB_PATH
echo "$HOME/.swift/usr/bin" >> $GITHUB_PATH
- name: "Install dependencies"
run: make stackArgs="--no-terminal" deps

Expand Down Expand Up @@ -113,6 +113,10 @@ jobs:
run: make convertAnalyzed
if: ${{ fromJSON(env.is_deployment) }}

- name: "Build trace graphs" # only needed in deployments, not required for tests
run: make tracegraphs
if: ${{ fromJSON(env.is_deployment) }}

- name: "Build website generator"
run: make website

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Lint.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
pull_request:
branches: main
paths: 'code/drasil-**'
paths: [code/drasil-**, .github/workflows/Lint.yaml]
name: Linter
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Wiki.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Wiki
on:
push:
branches: [main]
branches: main
paths: [wiki/**, .github/workflows/Wiki.yaml]
pull_request:
branches: [main]
branches: main
paths: [wiki/**, .github/workflows/Wiki.yaml]
permissions:
contents: write
Expand Down

0 comments on commit d3d569b

Please sign in to comment.