From e2f5b4f51a81ca21adcee6d9545c723d087d35da Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:15:04 -0800 Subject: [PATCH 1/9] [actions] The changelog action now requires .NET 9. So install that, since it doesn't look like it's installed by default yet. --- .github/workflows/maestro-changelog.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index f098f014838c..2510e552cb2d 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -22,6 +22,10 @@ jobs: cd dotnet-tools/changelog dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9' + - name: 'Add changelog' uses: actions/github-script@v7.0.1 with: From 1dbf64de2d8b8b53c7b856f5fb5af5e050f9346a Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:15:53 -0800 Subject: [PATCH 2/9] Remove filter while debugging. --- .github/workflows/maestro-changelog.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 2510e552cb2d..92f9391baf8a 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -12,7 +12,6 @@ jobs: issues: write pull-requests: write contents: read - if: github.actor == 'dotnet-maestro[bot]' steps: - name: 'Compute changelog' From edca367ab6ebb13a7f1e8c621899a44317a62a8e Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:17:09 -0800 Subject: [PATCH 3/9] Install dotnet _before_ we need it. --- .github/workflows/maestro-changelog.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 92f9391baf8a..d024a42a08cf 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -14,6 +14,10 @@ jobs: contents: read steps: + - uses: actions/setup-dotnet@v4 + with: + dotnet-version: '9' + - name: 'Compute changelog' run: | set -exo pipefail @@ -21,10 +25,6 @@ jobs: cd dotnet-tools/changelog dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 - - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '9' - - name: 'Add changelog' uses: actions/github-script@v7.0.1 with: From 466ad75230b6d6db8397f987d00280b85187ca6f Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:23:47 -0800 Subject: [PATCH 4/9] Revert "Remove filter while debugging." This reverts commit 55ce2fa54da0374cdba0a934b9de258ef120d590. --- .github/workflows/maestro-changelog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index d024a42a08cf..225732161ee6 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -12,6 +12,7 @@ jobs: issues: write pull-requests: write contents: read + if: github.actor == 'dotnet-maestro[bot]' steps: - uses: actions/setup-dotnet@v4 From 4fdbe971f4db5459f609d83cad5b66b386c87fea Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:15:53 -0800 Subject: [PATCH 5/9] Remove filter while debugging. --- .github/workflows/maestro-changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 225732161ee6..21ca6b7f396a 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -12,7 +12,6 @@ jobs: issues: write pull-requests: write contents: read - if: github.actor == 'dotnet-maestro[bot]' steps: - uses: actions/setup-dotnet@v4 @@ -25,6 +24,8 @@ jobs: git clone https://github.com/spouliot/dotnet-tools cd dotnet-tools/changelog dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 + cat /tmp/changelog + hexdump -C /tmp/changelog - name: 'Add changelog' uses: actions/github-script@v7.0.1 From 4756e17c77d8de63cc0dd278a874a9920b00ef9f Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:27:39 -0800 Subject: [PATCH 6/9] fix --- .github/workflows/maestro-changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 21ca6b7f396a..7981e087ff81 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -24,8 +24,8 @@ jobs: git clone https://github.com/spouliot/dotnet-tools cd dotnet-tools/changelog dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 - cat /tmp/changelog - hexdump -C /tmp/changelog + cat /tmp/changelog.txt + hexdump -C /tmp/changelog.txt - name: 'Add changelog' uses: actions/github-script@v7.0.1 From 629fa689eeffdf73a85cde09f193fa979d0cf37e Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:33:14 -0800 Subject: [PATCH 7/9] build first --- .github/workflows/maestro-changelog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 7981e087ff81..4eaa94fa5342 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -23,7 +23,8 @@ jobs: set -exo pipefail git clone https://github.com/spouliot/dotnet-tools cd dotnet-tools/changelog - dotnet run https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 + dotnet build + /bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 cat /tmp/changelog.txt hexdump -C /tmp/changelog.txt From 15a89c5e389662896b54d92d6dd3f52162360cf3 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:34:32 -0800 Subject: [PATCH 8/9] Dot --- .github/workflows/maestro-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index 4eaa94fa5342..e66a49d47a2a 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -24,7 +24,7 @@ jobs: git clone https://github.com/spouliot/dotnet-tools cd dotnet-tools/changelog dotnet build - /bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 + ./bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 cat /tmp/changelog.txt hexdump -C /tmp/changelog.txt From de5803a9e2a10417bad2170c9eda4bf3f30b70f4 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 15 Nov 2024 07:36:14 -0800 Subject: [PATCH 9/9] Undo debug stuff. --- .github/workflows/maestro-changelog.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml index e66a49d47a2a..cacbd9c9551f 100644 --- a/.github/workflows/maestro-changelog.yml +++ b/.github/workflows/maestro-changelog.yml @@ -12,6 +12,7 @@ jobs: issues: write pull-requests: write contents: read + if: github.actor == 'dotnet-maestro[bot]' steps: - uses: actions/setup-dotnet@v4 @@ -25,8 +26,6 @@ jobs: cd dotnet-tools/changelog dotnet build ./bin/Debug/net9.0/changelog https://github.com/$GITHUB_REPOSITORY/pull/${GITHUB_REF_NAME/\/*/} > /tmp/changelog.txt 2>&1 - cat /tmp/changelog.txt - hexdump -C /tmp/changelog.txt - name: 'Add changelog' uses: actions/github-script@v7.0.1