From 97532f87c62dd80033a7f41f31ea42b8654b6ddd Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:07:45 +0100 Subject: [PATCH 1/6] fix: replace groupinstall by group install --- .github/workflows/ci_cd.yml | 2 +- doc/source/installer.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 6a7dd97a..68fc82e5 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -253,7 +253,7 @@ jobs: if: contains(matrix.os, 'centos') || contains(matrix.os, 'fedora') run: | yum update -y - yum groupinstall "Development Tools" -y + yum group install "Development Tools" -y yum install python3 \ python3-pip \ wget \ diff --git a/doc/source/installer.rst b/doc/source/installer.rst index b7dbe01d..0e40f84b 100644 --- a/doc/source/installer.rst +++ b/doc/source/installer.rst @@ -162,7 +162,7 @@ Installing the ``Ansys Python Manager`` .. code:: shell sudo yum update -y; - sudo yum groupinstall 'Development Tools' -y; + sudo yum group install 'Development Tools' -y; sudo yum install wget gnome-terminal libffi-devel openssl-devel rpm-build sqlite-devel sqlite-libs libXinerama-devel coreutils -y; #. Install **zlib** package using **wget** From 4c484a43f67a3eff1084350ddb0a2bcac07c749e Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:10:50 +0100 Subject: [PATCH 2/6] fix: group name --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 68fc82e5..4cc23374 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -253,7 +253,7 @@ jobs: if: contains(matrix.os, 'centos') || contains(matrix.os, 'fedora') run: | yum update -y - yum group install "Development Tools" -y + yum group install "development-tools" -y yum install python3 \ python3-pip \ wget \ From b5a64e9f6a41d1d6b39f6a1be4497685b578e378 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:13:45 +0100 Subject: [PATCH 3/6] fix: if conditional --- .github/workflows/ci_cd.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 4cc23374..87c38f2a 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -253,7 +253,11 @@ jobs: if: contains(matrix.os, 'centos') || contains(matrix.os, 'fedora') run: | yum update -y - yum group install "development-tools" -y + if [[ ${{ matrix.os }} == "quay.io/centos/centos:stream9" ]]; then + yum groupinstall "Development Tools" -y + else + yum group install "development-tools" -y + fi yum install python3 \ python3-pip \ wget \ From a2720670764be42bff6c1613539a803d573d37b1 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:24:48 +0100 Subject: [PATCH 4/6] tmp: add debug logs --- .github/workflows/ci_cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 87c38f2a..8a5fe4e3 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -340,6 +340,8 @@ jobs: - name: Setup and Copy CentOS/RHEL files for packaging if: contains(matrix.os, 'centos') + env: + ACTIONS_STEP_DEBUG : true run: | yum install xorg-x11-utils -y mkdir -p package_CentOS/opt From 2a68929bdde7e784a5f3d455a3580eb3074657ac Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:28:53 +0100 Subject: [PATCH 5/6] tmp: add debug logs --- .github/workflows/ci_cd.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 8a5fe4e3..0bb65f56 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -366,6 +366,8 @@ jobs: - name: Setup and Copy Fedora files for packaging if: contains(matrix.os, 'fedora') + env: + ACTIONS_STEP_DEBUG : true run: | mkdir -p package_Fedora/opt mkdir -p package_Fedora/usr/share/applications From a78ad5d9afdf52add91b8e68abc8b6aa653dc792 Mon Sep 17 00:00:00 2001 From: Roberto Pastor Muela <37798125+RobPasMue@users.noreply.github.com> Date: Thu, 7 Nov 2024 09:46:19 +0100 Subject: [PATCH 6/6] feat: add debug logs --- .github/workflows/ci_cd.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 0bb65f56..b7459213 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -340,8 +340,6 @@ jobs: - name: Setup and Copy CentOS/RHEL files for packaging if: contains(matrix.os, 'centos') - env: - ACTIONS_STEP_DEBUG : true run: | yum install xorg-x11-utils -y mkdir -p package_CentOS/opt @@ -357,7 +355,7 @@ jobs: chmod +x package_CentOS/opt/ansys_python_manager/ansys_python_manager version=v`cat ./src/ansys/tools/installer/VERSION` echo "APPLICATION_VERSION=$version" >> $GITHUB_ENV - fpm -v $version --fpm-options-file linux/non-debian/fpm-options-centos + fpm -v $version --fpm-options-file linux/non-debian/fpm-options-centos --verbose cp ./linux/non-debian/installer_CentOS.sh installer_CentOS.sh cp ./linux/non-debian/updater_CentOS.sh updater_CentOS.sh chmod +x installer_CentOS.sh updater_CentOS.sh ansys_python_manager_CentOS.rpm @@ -366,8 +364,6 @@ jobs: - name: Setup and Copy Fedora files for packaging if: contains(matrix.os, 'fedora') - env: - ACTIONS_STEP_DEBUG : true run: | mkdir -p package_Fedora/opt mkdir -p package_Fedora/usr/share/applications @@ -382,7 +378,7 @@ jobs: chmod +x package_Fedora/opt/ansys_python_manager/ansys_python_manager version=v`cat ./src/ansys/tools/installer/VERSION` echo "APPLICATION_VERSION=$version" >> $GITHUB_ENV - fpm -v $version --fpm-options-file linux/non-debian/fpm-options-fedora + fpm -v $version --fpm-options-file linux/non-debian/fpm-options-fedora --verbose cp ./linux/non-debian/installer_CentOS.sh installer_Fedora.sh cp ./linux/non-debian/updater_CentOS.sh updater_Fedora.sh chmod +x installer_Fedora.sh updater_Fedora.sh ansys_python_manager_Fedora.rpm