From 7c1c268520859b2bdb429975f4d0f2c0c364ad16 Mon Sep 17 00:00:00 2001 From: Andrew Mogan Date: Thu, 9 Jan 2025 15:57:48 -0600 Subject: [PATCH] Issue #422: Revert exist_ok=True's and set on_retry_command for retry action --- .github/workflows/build-nightly-release-alma9.yml | 3 +++ scripts/spack/make-release-repo.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-nightly-release-alma9.yml b/.github/workflows/build-nightly-release-alma9.yml index 98b28245..8a8d7b74 100644 --- a/.github/workflows/build-nightly-release-alma9.yml +++ b/.github/workflows/build-nightly-release-alma9.yml @@ -83,6 +83,9 @@ jobs: cd $BASE_RELEASE_DIR/../ tar_and_stage_release ${BASE_RELEASE_TAG} + on_retry_command: | + rm -rf $BASE_RELEASE_DIR + rm -rf $DET_RELEASE_DIR - name: upload spack nightly tarball for base release uses: actions/upload-artifact@v4 diff --git a/scripts/spack/make-release-repo.py b/scripts/spack/make-release-repo.py index 0c44af85..2a3d5186 100755 --- a/scripts/spack/make-release-repo.py +++ b/scripts/spack/make-release-repo.py @@ -185,7 +185,7 @@ def generate_daq_package(self, repo_path, template_dir): depends_on_list = self.generate_depends_on_list(cmake_package_list) lines = lines.replace("XDEPENDSX", depends_on_list) ipkg_dir = os.path.join(repo_dir, ipkg["name"]) - os.makedirs(ipkg_dir, exist_ok=True) + os.makedirs(ipkg_dir) ipkgpy = os.path.join(ipkg_dir, "package.py") with open(ipkgpy, 'w') as o: o.write(lines) @@ -218,7 +218,7 @@ def generate_external_umbrella_package(self, repo_path, template_dir): lines += f'\n depends_on("{iname}@{iver} {ivar}")' lines += '\n' ipkg_dir = os.path.join(repo_dir, ipkg) - os.makedirs(ipkg_dir, exist_ok=True) + os.makedirs(ipkg_dir) ipkgpy = os.path.join(ipkg_dir, "package.py") with open(ipkgpy, 'w') as o: o.write(lines) @@ -257,7 +257,7 @@ def generate_daq_umbrella_package(self, repo_path, template_dir): lines += '\n' ipkg_dir = os.path.join(repo_dir, ipkg) - os.makedirs(ipkg_dir, exist_ok=True) + os.makedirs(ipkg_dir) ipkgpy = os.path.join(ipkg_dir, "package.py") with open(ipkgpy, 'w') as o: o.write(lines)