Skip to content

Commit 6923e96

Browse files
author
Pavel Chupin
authored
[CI][2/3] Add Ubuntu 22 containers build (#7362)
Follow up on #7106, this is patch 2 of 3 patches expected: Start running nightly on 22.04 containers in addition to 20.04 ones and push nightly containers. This is basically a copy-paste from 20.04 parts. As before push is not expected to happen until this change is actually merged. Based on the previous patch testing it seems it works well after merge and doesn't really work in pull_request mode. Adding more workflows to ignore in sycl_precommit.
1 parent d6a8fd1 commit 6923e96

File tree

4 files changed

+83
-8
lines changed

4 files changed

+83
-8
lines changed

.github/workflows/sycl_containers.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,10 @@ jobs:
190190
id: deps
191191
run: |
192192
DEPS=`cat devops/dependencies.json`
193-
DEPS="${DEPS//'%'/'%25'}"
194-
DEPS="${DEPS//$'\n'/'%0A'}"
195-
DEPS="${DEPS//$'\r'/'%0D'}"
193+
DEPS="${DEPS//$'\r'/''}"
194+
DEPS="${DEPS//$'\n'/' '}"
196195
echo $DEPS
197-
echo "::set-output name=deps::$DEPS"
196+
echo "deps=$DEPS" >>$GITHUB_OUTPUT
198197
- name: Build and Push Container
199198
uses: ./devops/actions/build_container
200199
with:
@@ -228,11 +227,10 @@ jobs:
228227
id: deps
229228
run: |
230229
DEPS=`cat devops/dependencies.json`
231-
DEPS="${DEPS//'%'/'%25'}"
232-
DEPS="${DEPS//$'\n'/'%0A'}"
233-
DEPS="${DEPS//$'\r'/'%0D'}"
230+
DEPS="${DEPS//$'\r'/''}"
231+
DEPS="${DEPS//$'\n'/' '}"
234232
echo $DEPS
235-
echo "::set-output name=deps::$DEPS"
233+
echo "deps=$DEPS" >>$GITHUB_OUTPUT
236234
- name: Build and Push Container
237235
uses: ./devops/actions/build_container
238236
with:

.github/workflows/sycl_nightly.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
paths:
99
- 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
10+
- 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
1011
- '.github/workflows/sycl_nightly.yml'
1112

1213
jobs:
@@ -26,6 +27,17 @@ jobs:
2627
build_artifact_suffix: default
2728
build_configure_extra_args: ''
2829

30+
ubuntu2204_build_test:
31+
if: github.repository == 'intel/llvm'
32+
uses: ./.github/workflows/sycl_linux_build_and_test.yml
33+
needs: test_matrix
34+
secrets: inherit
35+
with:
36+
build_cache_root: "/__w/"
37+
build_artifact_suffix: default
38+
build_configure_extra_args: ''
39+
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
40+
2941
ubuntu2004_opaque_pointers_build_test:
3042
if: github.repository == 'intel/llvm'
3143
uses: ./.github/workflows/sycl_linux_build_and_test.yml
@@ -37,6 +49,18 @@ jobs:
3749
build_artifact_suffix: opaque_pointers
3850
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
3951

52+
ubuntu2204_opaque_pointers_build_test:
53+
if: github.repository == 'intel/llvm'
54+
uses: ./.github/workflows/sycl_linux_build_and_test.yml
55+
needs: test_matrix
56+
secrets: inherit
57+
with:
58+
build_cache_root: "/__w/"
59+
build_cache_suffix: opaque_pointers
60+
build_artifact_suffix: opaque_pointers
61+
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
62+
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
63+
4064
windows_default:
4165
name: Windows
4266
if: github.repository == 'intel/llvm'
@@ -78,3 +102,40 @@ jobs:
78102
tags: |
79103
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
80104
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
105+
106+
ubuntu2204_docker_build_push:
107+
if: github.repository == 'intel/llvm'
108+
runs-on: ubuntu-latest
109+
needs: ubuntu2204_build_test
110+
steps:
111+
- uses: actions/checkout@v3
112+
- uses: actions/download-artifact@v3
113+
with:
114+
name: sycl_linux_default
115+
path: devops/
116+
- name: Build and Push Container (with drivers)
117+
uses: ./devops/actions/build_container
118+
with:
119+
push: ${{ github.event_name != 'pull_request' }}
120+
file: ubuntu2204_preinstalled
121+
username: ${{ github.repository_owner }}
122+
password: ${{ secrets.GITHUB_TOKEN }}
123+
build-args: |
124+
base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
125+
base_tag=latest
126+
tags: |
127+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
128+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:latest
129+
- name: Build and Push Container (no drivers)
130+
uses: ./devops/actions/build_container
131+
with:
132+
push: ${{ github.event_name != 'pull_request' }}
133+
file: ubuntu2204_preinstalled
134+
username: ${{ github.repository_owner }}
135+
password: ${{ secrets.GITHUB_TOKEN }}
136+
build-args: |
137+
base_image=ghcr.io/intel/llvm/ubuntu2204_base
138+
base_tag=latest
139+
tags: |
140+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers-${{ github.sha }}
141+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers

.github/workflows/sycl_precommit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- '.github/CODEOWNERS'
1111
- '.github/workflows/sycl_update_gpu_driver.yml'
1212
- '.github/workflows/sycl_containers.yaml'
13+
- '.github/workflows/sycl_nightly.yml'
14+
- '.github/workflows/sycl_post_commit.yml'
1315
- '.github/workflows/sycl_windows_build_and_test.yml'
1416
- '.github/workflows/sycl_macos_build_and_test.yml'
1517
- 'devops/containers/**'
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
ARG base_tag=latest
2+
ARG base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
3+
4+
FROM $base_image:$base_tag
5+
6+
COPY scripts/drivers_entrypoint.sh /drivers_entrypoint.sh
7+
RUN mkdir -p /opt/sycl
8+
ADD llvm_sycl.tar.xz /opt/sycl
9+
10+
ENV PATH /opt/sycl/bin:$PATH
11+
ENV LD_LIBRARY_PATH /opt/sycl/lib:$LD_LIBRARY_PATH
12+
13+
ENTRYPOINT ["/bin/bash", "/drivers_entrypoint.sh"]
14+

0 commit comments

Comments
 (0)