Skip to content

Commit 074c996

Browse files
committed
refactor: derive AMD container paths from a single AFAR_VERSION variable
1 parent 99b9ef9 commit 074c996

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/docker.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ jobs:
135135
${{ env.GH_REGISTRY }}:${{ env.TAG }}-${{ matrix.config.tag }}-${{ matrix.config.runner }}
136136
push: true
137137

138+
- name: Set AMD AFAR vars
139+
if: ${{ matrix.config.name == 'amd' }}
140+
run: |
141+
AFAR=rocm-afar-8873-drop-22.2.0
142+
ROOT="/opt/${AFAR}"
143+
echo "AFAR_VERSION=${AFAR}" >> $GITHUB_ENV
144+
echo "AFAR_ROOT=${ROOT}" >> $GITHUB_ENV
145+
138146
- name: Build and push image (amd)
139147
if: ${{ matrix.config.name == 'amd' }}
140148
uses: docker/build-push-action@v6
@@ -144,13 +152,13 @@ jobs:
144152
build-args: |
145153
BASE_IMAGE=${{ matrix.config.base_image }}
146154
TARGET=amd
147-
AFAR_VERSION=rocm-afar-8873-drop-22.2.0
148-
OLCF_AFAR_ROOT=/opt/rocm-afar-8873-drop-22.2.0
155+
AFAR_VERSION=${{ env.AFAR_VERSION }}
156+
OLCF_AFAR_ROOT=${{ env.AFAR_ROOT }}
149157
CC_COMPILER=gcc
150158
CXX_COMPILER=g++
151-
FC_COMPILER=/opt/rocm-afar-8873-drop-22.2.0/bin/amdflang
152-
COMPILER_PATH=/opt/rocm-afar-8873-drop-22.2.0/lib/llvm/bin:/opt/rocm-afar-8873-drop-22.2.0/bin
153-
COMPILER_LD_LIBRARY_PATH=/opt/rocm-afar-8873-drop-22.2.0/lib:/opt/rocm-afar-8873-drop-22.2.0/lib/llvm/lib
159+
FC_COMPILER=${{ env.AFAR_ROOT }}/bin/amdflang
160+
COMPILER_PATH=${{ env.AFAR_ROOT }}/lib/llvm/bin:${{ env.AFAR_ROOT }}/bin
161+
COMPILER_LD_LIBRARY_PATH=${{ env.AFAR_ROOT }}/lib:${{ env.AFAR_ROOT }}/lib/llvm/lib
154162
labels: |
155163
org.opencontainers.image.source=https://github.com/${{ github.repository }}
156164
tags: |

0 commit comments

Comments
 (0)