From 8f3939095dec5b840077fd4f1db94d64da1146b8 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 1 Mar 2024 11:16:48 +0100 Subject: [PATCH 1/3] gha - pin the gh-release action to get the node 20 fix --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 1c3de49eb8..6830e6e453 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -518,7 +518,7 @@ jobs: - name: Create Release id: create_release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@4634c16e79c963813287e889244c50009e7f0981 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From ad16f0661d9d576c71f715f048f0c9bfca3947db Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 1 Mar 2024 11:23:35 +0100 Subject: [PATCH 2/3] builds - make rhel build optional in releases --- .github/workflows/create-release.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 6830e6e453..4851339b28 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -448,14 +448,14 @@ jobs: publish-release: if: ${{ inputs.publish-release }} runs-on: ubuntu-latest - needs: - [ + needs: [ configure, make-installer-deb, make-installer-arm64-deb, make-installer-win, make-installer-mac, - make-tarball-rhel, + # optional in release to not be blocked by RHEL build depending on conda-forge deno dependency + # make-tarball-rhel, make-arm64-tarball, make-tarball, make-source-tarball, @@ -492,9 +492,11 @@ jobs: sha256sum quarto-${{needs.configure.outputs.version}}-macos.pkg >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt popd - pushd RHEL\ Zip - sha256sum quarto-${{needs.configure.outputs.version}}-linux-rhel7-amd64.tar.gz >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt - popd + if [ -f "RHEL Zip/quarto-${{needs.configure.outputs.version}}-linux-rhel7-amd64.tar.gz" ]; then + pushd RHEL\ Zip + sha256sum quarto-${{needs.configure.outputs.version}}-linux-rhel7-amd64.tar.gz >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt + popd + fi pushd Deb\ Zip sha256sum quarto-${{needs.configure.outputs.version}}-linux-amd64.tar.gz >> ../quarto-${{needs.configure.outputs.version}}-checksums.txt @@ -528,6 +530,7 @@ jobs: body_path: ./News/release_note.md draft: false prerelease: ${{ inputs.pre-release }} + fail_on_unmatched_files: false # rhel build may not be included files: | ./Source/quarto-${{needs.configure.outputs.version}}.tar.gz ./Deb Zip/quarto-${{needs.configure.outputs.version}}-linux-amd64.tar.gz @@ -544,14 +547,14 @@ jobs: cleanup-when-failure: if: ${{ (failure() || cancelled()) && inputs.publish-release }} - needs: - [ + needs: [ configure, make-installer-deb, make-installer-arm64-deb, make-installer-win, make-installer-mac, - make-tarball-rhel, + # optional in release to not be blocked by RHEL build depending on conda-forge deno dependency + # make-tarball-rhel, make-arm64-tarball, make-tarball, make-source-tarball, From 96aee6d87e644aab4e1441e1503d83e36bd9ee64 Mon Sep 17 00:00:00 2001 From: Christophe Dervieux Date: Fri, 1 Mar 2024 11:51:07 +0100 Subject: [PATCH 3/3] Add a message in release about the missing rhel build --- .github/workflows/create-release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 4851339b28..98a6907736 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -60,6 +60,8 @@ jobs: echo -e "\n\nFull ${version} changelog up to this version:\n" >> "release_note.md" echo -e " * View: https://github.com/${GITHUB_REPOSITORY}/blob/v${version_full}/news/changelog-${version}.md\n" >> "release_note.md" echo -e " * Download: https://github.com/${GITHUB_REPOSITORY}/releases/download/v${version_full}/changelog.md\n" >> "release_note.md" + echo -e "" >> "release_note.md" + echo -e "Due to an issue with upstream dependency, the RHEL build may not included in this release. Follow #8944 for more information." >> "release_note.md" - name: Upload Artifact uses: actions/upload-artifact@v3