From 7a4f886cc5e7ebf6fece90491cf4a437576d26a6 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Wed, 1 Oct 2025 10:11:40 +0100
Subject: [PATCH] CI: ubuntu.yml Remove workarounds for ppc64le/s390x

The 2 issues that we applied the workarounds for were fixed now.
---
 .github/workflows/ubuntu.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 6174e99170..af84972057 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -77,16 +77,6 @@ jobs:
           ${{ !endsWith(matrix.os, 'arm')
           && !endsWith(matrix.os, 'ppc64le') && !endsWith(matrix.os, 's390x') }}
 
-      # A temporary workaround: Set HOME env to pass the step
-      # ./.github/actions/setup/directories.
-      # https://github.com/IBM/actionspz/issues/30
-      - name: Set HOME env
-        run: |
-          echo "HOME: ${HOME}"
-          echo "HOME=$(ls -d ~)" >> $GITHUB_ENV
-        working-directory:
-        if: ${{ endsWith(matrix.os, 'ppc64le') || endsWith(matrix.os, 's390x') }}
-
       - uses: ./.github/actions/setup/directories
         with:
           srcdir: src
@@ -142,14 +132,6 @@ jobs:
         run: echo "DFLTCC=0" >> $GITHUB_ENV
         if: ${{ endsWith(matrix.os, 's390x') }}
 
-      # A temporary workaround: Set the user's primary group to avoid a mismatch
-      # between the group IDs of "id -g" and C function getpwuid(uid_t uid)
-      # pw_gid.
-      # https://github.com/IBM/actionspz/issues/31
-      - name: Set user's group id
-        run: sudo usermod -g "$(id -g)" runner
-        if: ${{ endsWith(matrix.os, 'ppc64le') || endsWith(matrix.os, 's390x') }}
-
       - name: make ${{ matrix.test_task }}
         run: |
           test -n "${LAUNCHABLE_STDOUT}" && exec 1> >(tee "${LAUNCHABLE_STDOUT}")