From 4935134316f1cf7006f2f89d1e071dace239e05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= <2493377+askpt@users.noreply.github.com> Date: Sun, 6 Apr 2025 18:52:22 +0100 Subject: [PATCH 1/2] chore: update workflows to use global.json for .NET SDK versioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com> --- .github/workflows/ci.yml | 18 +++++++----------- .github/workflows/code-coverage.yml | 4 +--- .github/workflows/dotnet-format.yml | 2 +- .github/workflows/e2e.yml | 4 +--- .github/workflows/release.yml | 10 +++------- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06746aff..7bf06b00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,19 +2,19 @@ name: CI on: push: - branches: [ main ] + branches: [main] paths-ignore: - - '**.md' + - "**.md" pull_request: - branches: [ main ] + branches: [main] paths-ignore: - - '**.md' + - "**.md" jobs: build: strategy: matrix: - os: [ ubuntu-latest, windows-latest ] + os: [ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} @@ -30,9 +30,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 8.0.x - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Restore @@ -65,9 +63,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 8.0.x - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Restore diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 603349e8..38313628 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -28,9 +28,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 8.0.x - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Run Test diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index e96d5ec0..63259de0 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4 with: - dotnet-version: 9.0.x + global-json-file: global.json - name: dotnet format run: dotnet format --verify-no-changes OpenFeature.sln diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f4a3d93c..ce4bb634 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -23,9 +23,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 8.0.x - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Initialize Tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5b17a1b..07b43020 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,9 +42,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 8.0.x - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Install dependencies @@ -74,8 +72,7 @@ jobs: env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - dotnet-version: | - 9.0.x + global-json-file: global.json source-url: https://nuget.pkg.github.com/open-feature/index.json - name: Install CycloneDX.NET @@ -87,5 +84,4 @@ jobs: - name: Attach SBOM to artifact env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - run: - gh release upload ${{ needs.release-please.outputs.release_tag_name }} bom.json + run: gh release upload ${{ needs.release-please.outputs.release_tag_name }} bom.json From 80622c2862d320057b65be9d677155329848d985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= <2493377+askpt@users.noreply.github.com> Date: Sun, 6 Apr 2025 18:53:38 +0100 Subject: [PATCH 2/2] fix: add release-type parameter to release-please action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com> --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07b43020..16babdca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,7 @@ jobs: token: ${{secrets.RELEASE_PLEASE_ACTION_TOKEN}} default-branch: main signoff: "OpenFeature Bot <109696520+openfeaturebot@users.noreply.github.com>" + release-type: simple outputs: release_created: ${{ steps.release.outputs.release_created }} release_tag_name: ${{ steps.release.outputs.tag_name }}