Skip to content

Commit 2f415cc

Browse files
test custom outpus docker build
1 parent 8ccfca5 commit 2f415cc

File tree

2 files changed

+13
-40
lines changed

2 files changed

+13
-40
lines changed

.github/workflows/sycl-containers.yaml

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -64,36 +64,23 @@ jobs:
6464
uses: ./devops/actions/build_container
6565
with:
6666
push: ${{ github.event_name != 'pull_request' }}
67-
load: ${{ github.event_name == 'pull_request' }}
6867
file: ${{ matrix.file }}
6968
username: ${{ github.repository_owner }}
7069
password: ${{ secrets.GITHUB_TOKEN }}
71-
tags: ghcr.io/intel/llvm/test1:${{ matrix.tag }}
70+
tags: ghcr.io/intel/llvm/test2:${{ matrix.tag }}
7271
build-args: ${{ matrix.build_args }}
7372
- name: Print dockers 2
7473
run: |
7574
docker image list
76-
- name: Print dockers 2204base
77-
run: |
78-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_base:latest || true
79-
- name: Print dockers 2404base
80-
run: |
81-
docker image inspect ghcr.io/intel/llvm/ubuntu2404_base:latest || true
82-
- name: Print dockers 2204build
83-
run: |
84-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_build:latest || true
8575
- name: Print dockers 2404build
8676
run: |
8777
docker image inspect ghcr.io/intel/llvm/ubuntu2404_build:latest || true
8878
- name: Print dockers 2204_intel_latest
8979
run: |
90-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest || true
91-
- name: Print dockers 2404_intel_latest
92-
run: |
93-
docker image inspect ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest || true
94-
- name: Print dockers 2204_intel_alldeps
80+
docker image inspect ghcr.io/intel/llvm/test1:abcdef || true
81+
- name: Print dockers 2204_intel_latest
9582
run: |
96-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_intel_drivers:alldeps || true
83+
docker image inspect ghcr.io/intel/llvm/test2:abcdef || true
9784
- name: Print dockers 2404_intel_alldeps
9885
run: |
9986
docker image inspect ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps || true
@@ -132,18 +119,20 @@ jobs:
132119
file: ubuntu2404_intel_drivers
133120
tag: alldeps
134121
build_args: |
135-
base_image=ghcr.io/intel/llvm/test1
122+
base_image=ghcr.io/intel/llvm/test2
136123
base_tag=abcdef
137124
steps:
138125
- name: Checkout
139126
uses: actions/checkout@v5
140127
with:
141128
fetch-depth: 2
129+
- name: Print dockers 1
130+
run: |
131+
docker image list
142132
- name: Build and Push Container
143133
uses: ./devops/actions/build_container
144134
with:
145135
push: ${{ github.event_name != 'pull_request' }}
146-
load: ${{ github.event_name == 'pull_request' }}
147136
file: ${{ matrix.file }}
148137
username: ${{ github.repository_owner }}
149138
password: ${{ secrets.GITHUB_TOKEN }}
@@ -154,27 +143,15 @@ jobs:
154143
- name: Print dockers
155144
run: |
156145
docker image list
157-
- name: Print dockers 2204base
158-
run: |
159-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_base:latest || true
160-
- name: Print dockers 2404base
161-
run: |
162-
docker image inspect ghcr.io/intel/llvm/ubuntu2404_base:latest || true
163-
- name: Print dockers 2204build
164-
run: |
165-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_build:latest || true
166146
- name: Print dockers 2404build
167147
run: |
168148
docker image inspect ghcr.io/intel/llvm/ubuntu2404_build:latest || true
169149
- name: Print dockers 2204_intel_latest
170150
run: |
171-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest || true
172-
- name: Print dockers 2404_intel_latest
173-
run: |
174-
docker image inspect ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest || true
175-
- name: Print dockers 2204_intel_alldeps
151+
docker image inspect ghcr.io/intel/llvm/test1:abcdef || true
152+
- name: Print dockers 2204_intel_latest
176153
run: |
177-
docker image inspect ghcr.io/intel/llvm/ubuntu2204_intel_drivers:alldeps || true
154+
docker image inspect ghcr.io/intel/llvm/test2:abcdef || true
178155
- name: Print dockers 2404_intel_alldeps
179156
run: |
180157
docker image inspect ghcr.io/intel/llvm/ubuntu2404_intel_drivers:alldeps || true

devops/actions/build_container/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ inputs:
1212
description: "Whether to push Docker image or not"
1313
required: false
1414
default: false
15-
load:
16-
description: "Whether to load Docker image (from local cache). Use if base image was not pushed to registry yet."
17-
required: false
18-
default: false
1915
username:
2016
description: "Registry user name"
2117
required: true
@@ -42,8 +38,8 @@ runs:
4238
- name: Build and Push Container
4339
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
4440
with:
45-
push: ${{ inputs.push }}
46-
load: ${{ inputs.load }}
41+
# push: ${{ inputs.push }}
42+
outputs: ${{ inputs.push == 'true' && 'type=registry' || 'type=docker' }}
4743
tags: ${{ inputs.tags }}
4844
build-args: ${{ inputs.build-args }}
4945
context: ${{ github.workspace }}/devops

0 commit comments

Comments
 (0)