Skip to content

Commit 876c50f

Browse files
author
Pavel V Chupin
committed
[CI][3/3] Finalize Ubuntu 20->22 migration
Follow up on #7362 * Erase Ubuntu 20 containers build * Move everywhere to Ubuntu 22 containers by default * Update clang version that we use in build to Ubuntu 22 version (jammy) * Update documentation
1 parent c64b157 commit 876c50f

13 files changed

+18
-295
lines changed

.github/workflows/sycl_containers.yaml

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -22,117 +22,6 @@ on:
2222
- '.github/workflows/sycl_containers.yaml'
2323

2424
jobs:
25-
base_image_ubuntu2004:
26-
if: github.repository == 'intel/llvm'
27-
name: Base Ubuntu 20.04 Docker image
28-
runs-on: ubuntu-latest
29-
steps:
30-
- name: Checkout
31-
uses: actions/checkout@v3
32-
with:
33-
fetch-depth: 2
34-
- name: Build and Push Container
35-
uses: ./devops/actions/build_container
36-
with:
37-
push: ${{ github.event_name != 'pull_request' }}
38-
file: ubuntu2004_base
39-
username: ${{ github.repository_owner }}
40-
password: ${{ secrets.GITHUB_TOKEN }}
41-
tags: |
42-
ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }}
43-
ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
44-
build_image_ubuntu2004:
45-
if: github.repository == 'intel/llvm'
46-
name: Build Ubuntu Docker image
47-
runs-on: ubuntu-latest
48-
steps:
49-
- name: Checkout
50-
uses: actions/checkout@v3
51-
with:
52-
fetch-depth: 2
53-
- name: Build and Push Container
54-
uses: ./devops/actions/build_container
55-
with:
56-
push: ${{ github.event_name != 'pull_request' }}
57-
file: ubuntu2004_build
58-
username: ${{ github.repository_owner }}
59-
password: ${{ secrets.GITHUB_TOKEN }}
60-
tags: |
61-
ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }}
62-
ghcr.io/${{ github.repository }}/ubuntu2004_build:latest
63-
64-
# This job produces a Docker container with the latest versions of Intel
65-
# drivers, that can be found on GitHub.
66-
drivers_image_ubuntu2004:
67-
if: github.repository == 'intel/llvm'
68-
name: Intel Drivers Ubuntu 20.04 Docker image
69-
runs-on: ubuntu-latest
70-
needs: base_image_ubuntu2004
71-
steps:
72-
- name: Checkout
73-
uses: actions/checkout@v3
74-
with:
75-
fetch-depth: 2
76-
- name: Get dependencies configuration
77-
id: deps
78-
run: |
79-
DEPS=`cat devops/dependencies.json`
80-
DEPS="${DEPS//$'\r'/''}"
81-
DEPS="${DEPS//$'\n'/' '}"
82-
echo $DEPS
83-
echo "deps=$DEPS" >>$GITHUB_OUTPUT
84-
- name: Build and Push Container
85-
uses: ./devops/actions/build_container
86-
with:
87-
push: ${{ github.event_name != 'pull_request' }}
88-
file: ubuntu2004_intel_drivers
89-
username: ${{ github.repository_owner }}
90-
password: ${{ secrets.GITHUB_TOKEN }}
91-
tags: |
92-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
93-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
94-
build-args: |
95-
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
96-
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
97-
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
98-
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
99-
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
100-
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
101-
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
102-
103-
# This job produces a Docker container with the latest versions of Intel
104-
# drivers, that can be found on GitHub.
105-
drivers_image_ubuntu2004_unstable:
106-
if: github.repository == 'intel/llvm'
107-
name: Intel Drivers (unstable) Ubuntu 20.04 Docker image
108-
runs-on: ubuntu-latest
109-
needs: base_image_ubuntu2004
110-
steps:
111-
- name: Checkout
112-
uses: actions/checkout@v3
113-
with:
114-
fetch-depth: 2
115-
- name: Get dependencies configuration
116-
id: deps
117-
run: |
118-
DEPS=`cat devops/dependencies.json`
119-
DEPS="${DEPS//$'\r'/''}"
120-
DEPS="${DEPS//$'\n'/' '}"
121-
echo $DEPS
122-
echo "deps=$DEPS" >>$GITHUB_OUTPUT
123-
- name: Build and Push Container
124-
uses: ./devops/actions/build_container
125-
with:
126-
push: ${{ github.event_name != 'pull_request' }}
127-
file: ubuntu2004_intel_drivers
128-
username: ${{ github.repository_owner }}
129-
password: ${{ secrets.GITHUB_TOKEN }}
130-
tags: |
131-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
132-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
133-
# build-args:empty , so we automatically take the "latest" tags as
134-
# unstable
135-
13625
base_image_ubuntu2204:
13726
if: github.repository == 'intel/llvm'
13827
name: Base Ubuntu 22.04 Docker image

.github/workflows/sycl_gen_test_matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
intel_drivers_image:
77
type: string
88
required: false
9-
default: "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest"
9+
default: "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest"
1010
amdgpu_image:
1111
type: string
1212
required: false
13-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
13+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1414
cuda_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1818
lts_config:
1919
type: string
2020
required: true

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
build_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1818
build_ref:
1919
type: string
2020
required: false

.github/workflows/sycl_nightly.yml

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- cron: '0 3 * * *'
77
pull_request:
88
paths:
9-
- 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
109
- 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
1110
- '.github/workflows/sycl_nightly.yml'
1211

@@ -17,16 +16,6 @@ jobs:
1716
with:
1817
lts_config: "ocl_gen9;ocl_x64"
1918

20-
ubuntu2004_build_test:
21-
if: github.repository == 'intel/llvm'
22-
uses: ./.github/workflows/sycl_linux_build_and_test.yml
23-
needs: test_matrix
24-
secrets: inherit
25-
with:
26-
build_cache_root: "/__w/"
27-
build_artifact_suffix: default
28-
build_configure_extra_args: ''
29-
3019
ubuntu2204_build_test:
3120
if: github.repository == 'intel/llvm'
3221
uses: ./.github/workflows/sycl_linux_build_and_test.yml
@@ -36,18 +25,6 @@ jobs:
3625
build_cache_root: "/__w/"
3726
build_artifact_suffix: default
3827
build_configure_extra_args: ''
39-
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
40-
41-
ubuntu2004_opaque_pointers_build_test:
42-
if: github.repository == 'intel/llvm'
43-
uses: ./.github/workflows/sycl_linux_build_and_test.yml
44-
needs: test_matrix
45-
secrets: inherit
46-
with:
47-
build_cache_root: "/__w/"
48-
build_cache_suffix: opaque_pointers
49-
build_artifact_suffix: opaque_pointers
50-
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
5128

5229
ubuntu2204_opaque_pointers_build_test:
5330
if: github.repository == 'intel/llvm'
@@ -59,50 +36,12 @@ jobs:
5936
build_cache_suffix: opaque_pointers
6037
build_artifact_suffix: opaque_pointers
6138
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"
6339

6440
windows_default:
6541
name: Windows
6642
if: github.repository == 'intel/llvm'
6743
uses: ./.github/workflows/sycl_windows_build_and_test.yml
6844

69-
ubuntu2004_docker_build_push:
70-
if: github.repository == 'intel/llvm'
71-
runs-on: ubuntu-latest
72-
needs: ubuntu2004_build_test
73-
steps:
74-
- uses: actions/checkout@v3
75-
- uses: actions/download-artifact@v3
76-
with:
77-
name: sycl_linux_default
78-
path: devops/
79-
- name: Build and Push Container (with drivers)
80-
uses: ./devops/actions/build_container
81-
with:
82-
push: ${{ github.event_name != 'pull_request' }}
83-
file: ubuntu2004_preinstalled
84-
username: ${{ github.repository_owner }}
85-
password: ${{ secrets.GITHUB_TOKEN }}
86-
build-args: |
87-
base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers
88-
base_tag=latest
89-
tags: |
90-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }}
91-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest
92-
- name: Build and Push Container (no drivers)
93-
uses: ./devops/actions/build_container
94-
with:
95-
push: ${{ github.event_name != 'pull_request' }}
96-
file: ubuntu2004_preinstalled
97-
username: ${{ github.repository_owner }}
98-
password: ${{ secrets.GITHUB_TOKEN }}
99-
build-args: |
100-
base_image=ghcr.io/intel/llvm/ubuntu2004_base
101-
base_tag=latest
102-
tags: |
103-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
104-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
105-
10645
ubuntu2204_docker_build_push:
10746
if: github.repository == 'intel/llvm'
10847
runs-on: ubuntu-latest

.github/workflows/sycl_post_commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
linux_clang_shared_libs:
4747
# TODO use nightly images when Docker containers are available
4848
name: Linux + Clang + Shared libs
49-
runs-on: ubuntu-20.04
49+
runs-on: ubuntu-22.04
5050
if: github.repository == 'intel/llvm'
5151
steps:
5252
- uses: actions/checkout@v3
@@ -65,7 +65,7 @@ jobs:
6565
- name: Configure
6666
run: |
6767
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
68-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
68+
sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
6969
sudo apt-get update
7070
sudo apt-get install -y clang-15
7171
export CC="clang-15"

.github/workflows/sycl_precommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
lint:
3131
runs-on: ubuntu-latest
3232
container:
33-
image: ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers
33+
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers
3434
steps:
3535
- name: 'PR commits + 1'
3636
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"

devops/containers/ubuntu2004_base.Dockerfile

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

devops/containers/ubuntu2004_build.Dockerfile

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

devops/containers/ubuntu2004_intel_drivers.Dockerfile

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

devops/containers/ubuntu2004_preinstalled.Dockerfile

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

0 commit comments

Comments
 (0)