Skip to content

[CI][3/3] Finalize Ubuntu 20->22 migration #7671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 4 additions & 115 deletions .github/workflows/sycl_containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,121 +22,10 @@ on:
- '.github/workflows/sycl_containers.yaml'

jobs:
base_image_ubuntu2004:
if: github.repository == 'intel/llvm'
name: Base Ubuntu 20.04 Docker image
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2
- name: Build and Push Container
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_base
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
tags: |
ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }}
ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
build_image_ubuntu2004:
if: github.repository == 'intel/llvm'
name: Build Ubuntu Docker image
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2
- name: Build and Push Container
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_build
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
tags: |
ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }}
ghcr.io/${{ github.repository }}/ubuntu2004_build:latest

# This job produces a Docker container with the latest versions of Intel
# drivers, that can be found on GitHub.
drivers_image_ubuntu2004:
if: github.repository == 'intel/llvm'
name: Intel Drivers Ubuntu 20.04 Docker image
runs-on: ubuntu-20.04
needs: base_image_ubuntu2004
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2
- name: Get dependencies configuration
id: deps
run: |
DEPS=`cat devops/dependencies.json`
DEPS="${DEPS//$'\r'/''}"
DEPS="${DEPS//$'\n'/' '}"
echo $DEPS
echo "deps=$DEPS" >>$GITHUB_OUTPUT
- name: Build and Push Container
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_intel_drivers
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
tags: |
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
build-args: |
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}

# This job produces a Docker container with the latest versions of Intel
# drivers, that can be found on GitHub.
drivers_image_ubuntu2004_unstable:
if: github.repository == 'intel/llvm'
name: Intel Drivers (unstable) Ubuntu 20.04 Docker image
runs-on: ubuntu-20.04
needs: base_image_ubuntu2004
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2
- name: Get dependencies configuration
id: deps
run: |
DEPS=`cat devops/dependencies.json`
DEPS="${DEPS//$'\r'/''}"
DEPS="${DEPS//$'\n'/' '}"
echo $DEPS
echo "deps=$DEPS" >>$GITHUB_OUTPUT
- name: Build and Push Container
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_intel_drivers
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
tags: |
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
# build-args:empty , so we automatically take the "latest" tags as
# unstable

base_image_ubuntu2204:
if: github.repository == 'intel/llvm'
name: Base Ubuntu 22.04 Docker image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -155,7 +44,7 @@ jobs:
build_image_ubuntu2204:
if: github.repository == 'intel/llvm'
name: Build Ubuntu Docker image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -177,7 +66,7 @@ jobs:
drivers_image_ubuntu2204:
if: github.repository == 'intel/llvm'
name: Intel Drivers Ubuntu 22.04 Docker image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: base_image_ubuntu2204
steps:
- name: Checkout
Expand Down Expand Up @@ -215,7 +104,7 @@ jobs:
drivers_image_ubuntu2204_unstable:
if: github.repository == 'intel/llvm'
name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: base_image_ubuntu2204
steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sycl_gen_test_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
intel_drivers_image:
type: string
required: false
default: "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest"
default: "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest"
amdgpu_image:
type: string
required: false
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
cuda_image:
type: string
required: false
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
lts_config:
type: string
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sycl_linux_build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
build_image:
type: string
required: false
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
build_ref:
type: string
required: false
Expand Down
63 changes: 1 addition & 62 deletions .github/workflows/sycl_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- cron: '0 3 * * *'
pull_request:
paths:
- 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
- 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
- '.github/workflows/sycl_nightly.yml'

Expand All @@ -17,16 +16,6 @@ jobs:
with:
lts_config: "ocl_gen9;ocl_x64"

ubuntu2004_build_test:
if: github.repository == 'intel/llvm'
uses: ./.github/workflows/sycl_linux_build_and_test.yml
needs: test_matrix
secrets: inherit
with:
build_cache_root: "/__w/"
build_artifact_suffix: default
build_configure_extra_args: ''

ubuntu2204_build_test:
if: github.repository == 'intel/llvm'
uses: ./.github/workflows/sycl_linux_build_and_test.yml
Expand All @@ -36,18 +25,6 @@ jobs:
build_cache_root: "/__w/"
build_artifact_suffix: default-2204
build_configure_extra_args: ''
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"

ubuntu2004_opaque_pointers_build_test:
if: github.repository == 'intel/llvm'
uses: ./.github/workflows/sycl_linux_build_and_test.yml
needs: test_matrix
secrets: inherit
with:
build_cache_root: "/__w/"
build_cache_suffix: opaque_pointers
build_artifact_suffix: opaque_pointers
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"

ubuntu2204_opaque_pointers_build_test:
if: github.repository == 'intel/llvm'
Expand All @@ -59,53 +36,15 @@ jobs:
build_cache_suffix: opaque_pointers
build_artifact_suffix: opaque_pointers-2204
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"

windows_default:
name: Windows
if: github.repository == 'intel/llvm'
uses: ./.github/workflows/sycl_windows_build_and_test.yml

ubuntu2004_docker_build_push:
if: github.repository == 'intel/llvm'
runs-on: ubuntu-20.04
needs: ubuntu2004_build_test
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: sycl_linux_default
path: devops/
- name: Build and Push Container (with drivers)
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_preinstalled
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers
base_tag=latest
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest
- name: Build and Push Container (no drivers)
uses: ./devops/actions/build_container
with:
push: ${{ github.event_name != 'pull_request' }}
file: ubuntu2004_preinstalled
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
build-args: |
base_image=ghcr.io/intel/llvm/ubuntu2004_base
base_tag=latest
tags: |
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers

ubuntu2204_docker_build_push:
if: github.repository == 'intel/llvm'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: ubuntu2204_build_test
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl_precommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ permissions:

jobs:
lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers
steps:
- name: 'PR commits + 1'
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ To contribute:
integrated into your workflow to ensure formatting and stylistic
compliance of your changes. To avoid code formatting misalignment with
GitHub Actions check we recommend using 10 version of clang-format tool
(default version on Ubuntu 20.04).
(default version on Ubuntu 22.04).
- use

```bash
Expand Down
26 changes: 0 additions & 26 deletions devops/containers/ubuntu2004_base.Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions devops/containers/ubuntu2004_build.Dockerfile

This file was deleted.

28 changes: 0 additions & 28 deletions devops/containers/ubuntu2004_intel_drivers.Dockerfile

This file was deleted.

Loading