From 7b34fa32250768e110478ba972d082a4c7ff5dac Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 6 Apr 2021 08:59:58 +0100 Subject: [PATCH 1/5] Update gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ec9db146247..1bb758e1ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ launchSettings.json project.lock.json .vs .vs/* +.ionide +.ionide/* .idea/ *.sln.iml From bae6a9655a948aa9b6c71e5a38e9562e38a46ca8 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 6 Apr 2021 09:03:28 +0100 Subject: [PATCH 2/5] Update make-release-notes --- .github/workflows/make-release-notes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/make-release-notes.yml b/.github/workflows/make-release-notes.yml index b1555d45d46..4bbbcce5113 100644 --- a/.github/workflows/make-release-notes.yml +++ b/.github/workflows/make-release-notes.yml @@ -58,14 +58,14 @@ jobs: - name: Find versions for branch id: versions run: | - readarray -t lines < <(dotnet-tool/release-notes "${{ github.event.organization.login }}" "${{ github.event.repository.name }}" current-version --query "${{ matrix.branch }}" --version 0.0.1 --token ${{ secrets.GITHUB_TOKEN }} --releasetagformat VERSION) + readarray -t lines < <(dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ github.repository }}' | awk -F '/' '{print $1}'" current-version --query "${{ matrix.branch }}" --version 0.0.1 --token ${{ secrets.GITHUB_TOKEN }} --releasetagformat VERSION) echo "::set-output name=current::$(echo ${lines[0]})" echo "::set-output name=next::$(echo ${lines[1]})" echo ${lines[@]} - name: Generate release notes run: | - dotnet-tool/release-notes "${{ github.event.organization.login }}" "${{ github.event.repository.name }}" --version ${{ steps.versions.outputs.next }} --token ${{ secrets.GITHUB_TOKEN }} --format asciidoc --output docs/release-notes + dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ github.repository }}' | awk -F '/' '{print $1}'" --version ${{ steps.versions.outputs.next }} --token ${{ secrets.GITHUB_TOKEN }} --format asciidoc --output docs/release-notes rm dotnet-tool/release-notes git status - name: "PR ${{ matrix.branch }}" From 5232578a5d47a653ba49988cfe88509f222bf8c1 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 6 Apr 2021 09:14:28 +0100 Subject: [PATCH 3/5] Update GitHub action --- .github/workflows/make-release-notes.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/make-release-notes.yml b/.github/workflows/make-release-notes.yml index 4bbbcce5113..cb5a9d83b47 100644 --- a/.github/workflows/make-release-notes.yml +++ b/.github/workflows/make-release-notes.yml @@ -55,17 +55,20 @@ jobs: - name: Install dotnet-script run: dotnet tool install release-notes --tool-path dotnet-tool + - name: Set repository name environment variable + run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $1}')" >> $GITHUB_ENV + - name: Find versions for branch id: versions - run: | - readarray -t lines < <(dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ github.repository }}' | awk -F '/' '{print $1}'" current-version --query "${{ matrix.branch }}" --version 0.0.1 --token ${{ secrets.GITHUB_TOKEN }} --releasetagformat VERSION) + run: | + readarray -t lines < <(dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ env.repository_name }}" current-version --query "${{ matrix.branch }}" --version 0.0.1 --token ${{ secrets.GITHUB_TOKEN }} --releasetagformat VERSION) echo "::set-output name=current::$(echo ${lines[0]})" echo "::set-output name=next::$(echo ${lines[1]})" echo ${lines[@]} - name: Generate release notes run: | - dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ github.repository }}' | awk -F '/' '{print $1}'" --version ${{ steps.versions.outputs.next }} --token ${{ secrets.GITHUB_TOKEN }} --format asciidoc --output docs/release-notes + dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ env.repository_name }}" --version ${{ steps.versions.outputs.next }} --token ${{ secrets.GITHUB_TOKEN }} --format asciidoc --output docs/release-notes rm dotnet-tool/release-notes git status - name: "PR ${{ matrix.branch }}" From 052b055d97e1feae726bb7cef445bc606cfdbf25 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 6 Apr 2021 09:15:02 +0100 Subject: [PATCH 4/5] cleanup --- .github/workflows/make-release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/make-release-notes.yml b/.github/workflows/make-release-notes.yml index cb5a9d83b47..8c684630ce1 100644 --- a/.github/workflows/make-release-notes.yml +++ b/.github/workflows/make-release-notes.yml @@ -60,7 +60,7 @@ jobs: - name: Find versions for branch id: versions - run: | + run: | readarray -t lines < <(dotnet-tool/release-notes "${{ github.repository_owner }}" "${{ env.repository_name }}" current-version --query "${{ matrix.branch }}" --version 0.0.1 --token ${{ secrets.GITHUB_TOKEN }} --releasetagformat VERSION) echo "::set-output name=current::$(echo ${lines[0]})" echo "::set-output name=next::$(echo ${lines[1]})" From cb014b25cdf533aeea78fad256f3619e10f0909f Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 6 Apr 2021 09:34:35 +0100 Subject: [PATCH 5/5] Select correct part of repository name --- .github/workflows/make-release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/make-release-notes.yml b/.github/workflows/make-release-notes.yml index 8c684630ce1..bf1eb903400 100644 --- a/.github/workflows/make-release-notes.yml +++ b/.github/workflows/make-release-notes.yml @@ -56,7 +56,7 @@ jobs: run: dotnet tool install release-notes --tool-path dotnet-tool - name: Set repository name environment variable - run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $1}')" >> $GITHUB_ENV + run: echo "repository_name=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV - name: Find versions for branch id: versions