Skip to content

Commit 81ce716

Browse files
authored
Merge pull request intel#99 from elbeno/update-workflows
2 parents d3baa96 + dc01c1e commit 81ce716

File tree

4 files changed

+179
-75
lines changed

4 files changed

+179
-75
lines changed

.github/workflows/asciidoctor-ghpages.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
configure:
1414
name: Configure Github Pages Publishing
15-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
15+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
1616
outputs:
1717
enable_publish: ${{ steps.check.outputs.isfork == 'NO' }}
1818
steps:
@@ -30,18 +30,17 @@ jobs:
3030
build:
3131
needs: configure
3232
name: Build Documentation
33-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
33+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
3434
steps:
3535
- name: Checkout source
3636
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3737
- name: Setup Node.js
3838
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3939
with:
40-
node-version: 18
40+
node-version: 20
4141
- name: Install Mermaid
4242
run: |
43-
sudo npm install -g @mermaid-js/[email protected]
44-
node /usr/local/lib/node_modules/@mermaid-js/mermaid-cli/node_modules/puppeteer/install.js
43+
sudo npm install -g @mermaid-js/[email protected]
4544
- name: Install asciidoctor
4645
run: |
4746
sudo apt update
@@ -73,7 +72,7 @@ jobs:
7372
environment:
7473
name: github-pages
7574
url: ${{ steps.deployment.outputs.page_url }}
76-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
75+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
7776
steps:
7877
- name: Deploy to github pages
7978
id: deployment

.github/workflows/test.yml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,45 +19,48 @@ env:
1919
DEBIAN_FRONTEND: noninteractive
2020
CMAKE_GENERATOR: Ninja
2121
TARGET_LLVM_VERSION: 18
22-
MULL_LLVM_VERSION: 15
22+
MULL_LLVM_VERSION: 17
2323

2424
concurrency:
2525
group: ${{ github.head_ref || github.run_id }}
2626
cancel-in-progress: true
2727

2828
jobs:
2929
test:
30-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
30+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
3131
steps:
3232
- name: Install build tools
3333
run: |
3434
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh ${{env.TARGET_LLVM_VERSION}}
35-
sudo apt install -y python3-pip ninja-build clang-tidy-${{env.TARGET_LLVM_VERSION}} clang-format-${{env.TARGET_LLVM_VERSION}}
35+
sudo apt update && sudo apt install -y pipx ninja-build clang-tidy-${{env.TARGET_LLVM_VERSION}} clang-format-${{env.TARGET_LLVM_VERSION}}
3636
3737
- name: Setup Node.js
3838
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3939
with:
40-
node-version: 18
40+
node-version: 20
4141

4242
- name: Install Mermaid
4343
run: |
44-
sudo npm install -g @mermaid-js/[email protected]
45-
node /usr/local/lib/node_modules/@mermaid-js/mermaid-cli/node_modules/puppeteer/install.js
44+
sudo npm install -g @mermaid-js/[email protected]
4645
4746
- name: Install asciidoctor
4847
run: |
49-
sudo apt update && sudo apt install -y asciidoctor
48+
sudo apt install -y asciidoctor
5049
sudo gem install asciidoctor asciidoctor-diagram rouge
5150
5251
- name: Install cmake-format
5352
run: |
54-
sudo pip3 install --upgrade pip
55-
sudo pip3 install pyyaml cmake-format
56-
echo "${HOME}/.local/bin" >> $GITHUB_PATH
53+
pipx install cmakelang
54+
pipx inject cmakelang pyyaml
5755
5856
- name: Install python quality tools
5957
run: |
60-
sudo pip3 install pytest pytest-forked hypothesis mypy black
58+
pipx install pytest
59+
pipx inject pytest pytest-forked
60+
pipx inject pytest hypothesis
61+
pipx install mypy
62+
pipx install black
63+
echo "/opt/pipx_bin" >> $GITHUB_PATH
6164
6265
- name: Checkout target branch
6366
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
@@ -119,7 +122,7 @@ jobs:
119122
working-directory: ${{github.workspace}}/test/application
120123
run: |
121124
cmake --build build -t build_unit_tests
122-
ctest --test-dir build
125+
ctest --output-on-failure --test-dir build
123126
124127
- name: Run benchmarks
125128
working-directory: ${{github.workspace}}/test/application
@@ -149,7 +152,7 @@ jobs:
149152
run: ./verify_links.sh
150153

151154
sanitize:
152-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
155+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
153156
strategy:
154157
fail-fast: false
155158
matrix:
@@ -203,19 +206,19 @@ jobs:
203206
run: cmake --build build -t cpp_tests
204207

205208
mutate:
206-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
209+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
207210
steps:
208211
- name: Install build tools
209212
run: |
210213
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh ${{env.MULL_LLVM_VERSION}}
211-
sudo apt install -y python3-pip ninja-build
214+
sudo apt install -y ninja-build
212215
213216
- name: Install mull
214217
env:
215218
MULL_VERSION: 0.23.0
216219
run: |
217-
wget https://github.com/mull-project/mull/releases/download/${{env.MULL_VERSION}}/Mull-${{env.MULL_LLVM_VERSION}}-${{env.MULL_VERSION}}-LLVM-${{env.MULL_LLVM_VERSION}}.0-ubuntu-22.04.deb
218-
sudo dpkg -i Mull-${{env.MULL_LLVM_VERSION}}-${{env.MULL_VERSION}}-LLVM-${{env.MULL_LLVM_VERSION}}.0-ubuntu-22.04.deb
220+
wget https://github.com/mull-project/mull/releases/download/${{env.MULL_VERSION}}/Mull-${{env.MULL_LLVM_VERSION}}-${{env.MULL_VERSION}}-LLVM-${{env.MULL_LLVM_VERSION}}.0-ubuntu-24.04.deb
221+
sudo dpkg -i Mull-${{env.MULL_LLVM_VERSION}}-${{env.MULL_VERSION}}-LLVM-${{env.MULL_LLVM_VERSION}}.0-ubuntu-24.04.deb
219222
220223
- name: Checkout PR branch
221224
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
@@ -253,8 +256,8 @@ jobs:
253256
cmake --build build -t mull_tests
254257
255258
merge_ok:
256-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
257-
needs: [test, sanitize]
259+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
260+
needs: [test, sanitize, mutate]
258261
if: ${{ !cancelled() }}
259262
steps:
260263
- name: Enable merge

ci/.github/workflows/asciidoctor-ghpages.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
configure:
1414
name: Configure Github Pages Publishing
15-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
15+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
1616
outputs:
1717
enable_publish: ${{ steps.check.outputs.isfork == 'NO' }}
1818
steps:
@@ -30,18 +30,17 @@ jobs:
3030
build:
3131
needs: configure
3232
name: Build Documentation
33-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
33+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
3434
steps:
3535
- name: Checkout source
3636
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3737
- name: Setup Node.js
3838
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3939
with:
40-
node-version: 18
40+
node-version: 20
4141
- name: Install Mermaid
4242
run: |
43-
sudo npm install -g @mermaid-js/[email protected]
44-
node /usr/local/lib/node_modules/@mermaid-js/mermaid-cli/node_modules/puppeteer/install.js
43+
sudo npm install -g @mermaid-js/[email protected]
4544
- name: Install asciidoctor
4645
run: |
4746
sudo apt update
@@ -73,7 +72,7 @@ jobs:
7372
environment:
7473
name: github-pages
7574
url: ${{ steps.deployment.outputs.page_url }}
76-
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
75+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-24.04
7776
steps:
7877
- name: Deploy to github pages
7978
id: deployment

0 commit comments

Comments
 (0)