Skip to content

Commit d8ce1d9

Browse files
random fixes
1 parent c854942 commit d8ce1d9

File tree

5 files changed

+50
-11
lines changed

5 files changed

+50
-11
lines changed

.github/docker/ubuntu-20.04.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# environment for building the Unified Memory Framework project.
88
#
99

10+
#
1011
# Pull base image ("20.04")
1112
FROM registry.hub.docker.com/library/ubuntu@sha256:f2034e7195f61334e6caff6ecf2e965f92d11e888309065da85ff50c617732b8
1213

.github/workflows/build_dockers.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
outputs:
1919
status: ${{ job.status }}
2020
env:
21-
GHCR_TOKEN: ${{ secrets.BB_GHCR_TOKEN }} # ${{ secrets.GHCR_TOKEN }}
22-
IMG: ghcr.io/${{ github.bb-ur }}/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
21+
IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
2322

2423
steps:
2524
- name: Checkout repository
@@ -31,8 +30,8 @@ jobs:
3130
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
3231
with:
3332
registry: ghcr.io
34-
username: ${{ github.bb-ur }} # ${{ github.actor }}
35-
password: ${{ env.BB_GHCR_TOKEN }} # ${{ env.GHCR_TOKEN }}
33+
username: bb-ur
34+
password: ${{ secrets.BB_GHCR_TOKEN }}
3635

3736
- name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
3837
run: |

.github/workflows/reusable_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
CodeChecks:
1212
name: Basic code checks
13-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-latest' }}
13+
runs-on: 'ubuntu-latest'
1414

1515
steps:
1616
- name: Checkout repository
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Build and push Docker images to GHCR
2+
name: Dockers Build
3+
4+
on:
5+
workflow_call:
6+
workflow_dispatch:
7+
8+
permissions:
9+
packages: write
10+
contents: read
11+
12+
jobs:
13+
build-dockers:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
ubuntu-version: [20.04, 22.04, 24.04]
18+
outputs:
19+
status: ${{ job.status }}
20+
env:
21+
IMG: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu-version }}:latest
22+
23+
steps:
24+
- name: Checkout repository
25+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
26+
with:
27+
fetch-depth: 0
28+
29+
- name: Login to GitHub Container Registry
30+
uses: docker/login-action@30f019fb76bb54d03ec1e716054622be511a13b2 # v3.2.0
31+
with:
32+
registry: ghcr.io
33+
username: bb-ur
34+
password: ${{ secrets.BB_GHCR_TOKEN }}
35+
36+
- name: Build and push ubuntu-${{ matrix.ubuntu-version }} Docker image
37+
run: |
38+
docker build -f .github/docker/ubuntu-${{ matrix.ubuntu-version }}.Dockerfile -t ${{ env.IMG }} .
39+
docker push ${{ env.IMG }}

.github/workflows/reusable_fast.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ env:
1414
jobs:
1515
ubuntu-build:
1616
name: Linux
17-
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
17+
runs-on: ubuntu-22.04
1818
container:
19-
image: ${{ matrix.image }}
19+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2020
options: --user root --privileged
2121
volumes:
2222
- ${{ github.workspace }}:${{ github.workspace }}
2323
strategy:
2424
matrix:
2525
include:
26-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
26+
- ubuntu_ver: 22.04
2727
build_tests: 'ON'
2828
extra_build_options: ' -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
2929
simple_cmake: 'OFF'
3030
# pure C build
31-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
31+
- ubuntu_ver: 22.04
3232
build_tests: 'OFF'
3333
extra_build_options: '-DUMF_BUILD_BENCHMARKS=ON'
3434
simple_cmake: 'OFF'
3535
# simplest CMake on ubuntu-latest
36-
- image: ghcr.io/rbanka1/umf-ubuntu-22.04:latest
36+
- ubuntu_ver: 24.04
3737
build_tests: 'ON'
3838
simple_cmake: 'ON'
39-
- image: ghcr.io/rbanka1/umf-ubuntu-20.04:latest
39+
- ubuntu_ver: 20.04
4040
build_tests: 'ON'
4141
simple_cmake: 'ON'
4242

0 commit comments

Comments
 (0)