From 8879731a9d8c88e96a0923926cede7ebc2fa6a5a Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Tue, 5 Aug 2025 21:07:11 +0000 Subject: [PATCH 1/3] DAOS-17877 cq: give create_release.yml write permission Give create_release.yml write permission so it can create tags. Also exit on error. Doc-only: true Signed-off-by: Dalton Bohning --- .github/actions/make_release/entrypoint.sh | 2 ++ .github/workflows/create_release.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/actions/make_release/entrypoint.sh b/.github/actions/make_release/entrypoint.sh index 957d8b367c0..09a02b6c738 100755 --- a/.github/actions/make_release/entrypoint.sh +++ b/.github/actions/make_release/entrypoint.sh @@ -1,5 +1,7 @@ #!/bin/bash -l +set -e + # Only need to do any of this if the version has been updated # NOTE: The diff-index with HEAD^ implies that the TAG # must be updated in the last commit. But version update diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 6e174f0b74a..058686eb21a 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -15,6 +15,8 @@ jobs: name: Create Release if: github.repository == 'daos-stack/daos' runs-on: ubuntu-latest + permissions: + contents: write steps: - uses: actions/checkout@v4 with: From 034ae0a8afc803ee1a8775b1c36e8e46d5e36344 Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Tue, 5 Aug 2025 21:18:05 +0000 Subject: [PATCH 2/3] test it Doc-only: true Signed-off-by: Dalton Bohning --- .github/actions/make_release/entrypoint.sh | 13 +++++++------ .github/workflows/create_release.yml | 3 +++ TAG | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/actions/make_release/entrypoint.sh b/.github/actions/make_release/entrypoint.sh index 09a02b6c738..4381374248c 100755 --- a/.github/actions/make_release/entrypoint.sh +++ b/.github/actions/make_release/entrypoint.sh @@ -20,13 +20,14 @@ if git diff-tree --diff-filter=A --no-commit-id --name-status -r HEAD | exit 0 fi -release=$(cat TAG) +release=$(cat TAG)-test -if [[ $release = *-* ]]; then - prerelease="true" -else - prerelease="false" -fi +prerelease="true" +# if [[ $release = *-* ]]; then +# prerelease="true" +# else +# prerelease="false" +# fi # Ensure that the GITHUB_TOKEN secret is included if [ -z "$GITHUB_TOKEN" ]; then echo "Set the GITHUB_TOKEN env variable." diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 058686eb21a..5c4ab478cb8 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -7,6 +7,9 @@ on: branches: - master - 'release/**' + pull_request: + paths: + - TAG permissions: {} diff --git a/TAG b/TAG index 9071fdd003b..d78810e7b36 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -2.7.101-tb +2.7.101-tb-daltonbohning From 1177b3949bf97b9f7e3cae96b5c7ebef7e42fa67 Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Tue, 5 Aug 2025 21:22:30 +0000 Subject: [PATCH 3/3] Revert "test it" This reverts commit 034ae0a8afc803ee1a8775b1c36e8e46d5e36344. Doc-only: true Signed-off-by: Dalton Bohning --- .github/actions/make_release/entrypoint.sh | 13 ++++++------- .github/workflows/create_release.yml | 3 --- TAG | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/actions/make_release/entrypoint.sh b/.github/actions/make_release/entrypoint.sh index 4381374248c..09a02b6c738 100755 --- a/.github/actions/make_release/entrypoint.sh +++ b/.github/actions/make_release/entrypoint.sh @@ -20,14 +20,13 @@ if git diff-tree --diff-filter=A --no-commit-id --name-status -r HEAD | exit 0 fi -release=$(cat TAG)-test +release=$(cat TAG) -prerelease="true" -# if [[ $release = *-* ]]; then -# prerelease="true" -# else -# prerelease="false" -# fi +if [[ $release = *-* ]]; then + prerelease="true" +else + prerelease="false" +fi # Ensure that the GITHUB_TOKEN secret is included if [ -z "$GITHUB_TOKEN" ]; then echo "Set the GITHUB_TOKEN env variable." diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 5c4ab478cb8..058686eb21a 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -7,9 +7,6 @@ on: branches: - master - 'release/**' - pull_request: - paths: - - TAG permissions: {} diff --git a/TAG b/TAG index d78810e7b36..9071fdd003b 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -2.7.101-tb-daltonbohning +2.7.101-tb