Skip to content

Commit c2d35fc

Browse files
committed
fix
1 parent b668842 commit c2d35fc

6 files changed

+10
-16
lines changed

.github/docker/ubuntu-20.04.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARG HWLOC_DEPS="\
3131
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh
3232

3333
# UMF's dependencies
34-
# libhwloc-dev is required - installed via script because hwloc verion is to old on this OS
34+
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS
3535

3636
# Dependencies for tests (optional)
3737
ARG TEST_DEPS="\

.github/docker/ubuntu-22.04.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ ENV DEBIAN_FRONTEND noninteractive
2020
ARG BASE_DEPS="\
2121
build-essential \
2222
cmake \
23-
git"
23+
git \
24+
libtool"
2425

2526
# UMF's dependencies
2627
ARG UMF_DEPS="\

.github/docker/ubuntu-24.04.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ ENV DEBIAN_FRONTEND noninteractive
2020
ARG BASE_DEPS="\
2121
build-essential \
2222
cmake \
23-
git"
23+
git \
24+
gnupg"
2425

2526
# UMF's dependencies
2627
ARG UMF_DEPS="\

.github/workflows/reusable_basic.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
name: Ubuntu
1919
runs-on: ubuntu-latest
2020
container:
21-
# image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
22-
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
21+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2322
options: --user root --privileged
2423
volumes:
2524
- ${{ github.workspace }}:${{ github.workspace }}

.github/workflows/reusable_dockers_build.yml

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

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

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

.github/workflows/reusable_fast.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
name: Linux
1717
runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
1818
container:
19-
# image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
20-
image: ghcr.io/rbanka1/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest # test
19+
image: ghcr.io/bb-ur/umf-ubuntu-${{ matrix.ubuntu_ver }}:latest
2120
options: --user root --privileged
2221
volumes:
2322
- ${{ github.workspace }}:${{ github.workspace }}
@@ -34,16 +33,13 @@ jobs:
3433
build_tests: 'OFF'
3534
extra_build_options: '-DUMF_BUILD_BENCHMARKS=ON'
3635
simple_cmake: 'OFF'
37-
# simplest CMake on Ubuntu 22.04, 24.04, 20.04
36+
# simplest CMake on Ubuntu 22.04, 24.04
3837
- ubuntu_ver: 22.04
3938
build_tests: 'ON'
4039
simple_cmake: 'ON'
4140
- ubuntu_ver: 24.04
4241
build_tests: 'ON'
4342
simple_cmake: 'ON'
44-
- ubuntu_ver: 20.04
45-
build_tests: 'ON'
46-
simple_cmake: 'ON'
4743

4844
steps:
4945
- name: Checkout repository

0 commit comments

Comments
 (0)