From a9c25bfb6b7d766be279cf8e01fe9348da96958f Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 5 Mar 2024 13:54:17 +0900 Subject: [PATCH 1/2] RHEL build multiarch (test) --- .github/workflows/images_build_rhel_multiarch.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/images_build_rhel_multiarch.yml b/.github/workflows/images_build_rhel_multiarch.yml index 775168bdd..d9fed43d1 100644 --- a/.github/workflows/images_build_rhel_multiarch.yml +++ b/.github/workflows/images_build_rhel_multiarch.yml @@ -12,7 +12,7 @@ on: - 'Dockerfiles/*/rhel/*' - 'build.json' - '!**/README.md' - - '.github/workflows/images_build_test.yml' + - '.github/workflows/images_build_rhel_multiarch.yml' # schedule: # - cron: '50 02 * * *' workflow_dispatch: @@ -152,15 +152,16 @@ jobs: result=true fi - echo "::group::Branch data" + echo "::group::Branch metadata" echo "is_default_branch - $result" echo "current_branch - $github_ref" + echo "secret_prefix=RHEL_${github_ref//.}" echo "sha_short - $sha_short" echo "::endgroup::" echo "is_default_branch=$result" >> $GITHUB_OUTPUT echo "current_branch=$github_ref" >> $GITHUB_OUTPUT - echo "secret_prefix=RHEL_64" >> $GITHUB_OUTPUT + echo "secret_prefix=RHEL_${github_ref//.}" >> $GITHUB_OUTPUT echo "sha_short=$sha_short" >> $GITHUB_OUTPUT build_base: From 1e1361ad01dc2efd6245bd39de8dfc7e20819a99 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 5 Mar 2024 13:56:02 +0900 Subject: [PATCH 2/2] RHEL build multiarch (test) --- build.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.json b/build.json index c965bf123..9c9445aab 100644 --- a/build.json +++ b/build.json @@ -18,8 +18,10 @@ "linux/arm64" ], "rhel": [ - "X64", - "ARM64" + "linux/amd64", + "linux/arm64", + "linux/ppc64le", + "linux/s390x" ], "ubuntu": [ "linux/amd64",