From 8305691a24ea1f4afd283e0abd640d7f39af904d Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 17 Jul 2025 12:55:43 -0700 Subject: [PATCH 1/2] Remove PR filter from release action --- .github/workflows/merge-bot-pr.yml | 6 +++--- .github/workflows/publish-release.yml | 8 -------- .github/workflows/test.yml | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index 70874e3..a6688fc 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -1,4 +1,4 @@ -name: Merge bot generated PR's +name: Merge bot generated PRs on: pull_request: @@ -10,7 +10,7 @@ concurrency: jobs: merge-dependabot: - name: Merge dependabot PR's + name: Merge dependabot PRs runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' permissions: @@ -42,7 +42,7 @@ jobs: steps: - - name: Merge language data PR's + - name: Merge language data PRs run: gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index d164c55..a5e3333 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -19,30 +19,25 @@ jobs: name: Publish release runs-on: ubuntu-latest needs: test - if: github.event_name != 'pull_request' permissions: contents: write steps: - # https://github.com/marketplace/actions/setup-net-core-sdk - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: 9.x - # https://github.com/marketplace/actions/checkout - name: Checkout code uses: actions/checkout@v4 with: fetch-depth: 0 - # https://github.com/marketplace/actions/nerdbank-gitversioning - name: Run Nerdbank.GitVersioning id: nbgv uses: dotnet/nbgv@master - # https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-build - name: Build project run: >- dotnet build ./LanguageTags/LanguageTags.csproj @@ -54,9 +49,7 @@ jobs: -property:InformationalVersion=${{ steps.nbgv.outputs.AssemblyInformationalVersion }} -property:PackageVersion=${{ steps.nbgv.outputs.SemVer2 }} - # https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push - name: Publish to NuGet.org - if: github.event_name != 'pull_request' run: >- dotnet nuget push ${{ github.workspace }}/Publish/*.nupkg --source https://api.nuget.org/v3/index.json @@ -69,7 +62,6 @@ jobs: cp ./LanguageData/*.json ./Publish/ 7z a -t7z ./Publish/LanguageTags.7z ./Publish/* - # https://github.com/marketplace/actions/gh-release - name: Create GitHub release if: github.event_name != 'pull_request' uses: softprops/action-gh-release@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 258a036..3479104 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Checks code style + - name: Check code style run: | dotnet tool restore dotnet csharpier check --log-level=debug . From f6f3de05fb74918d65f2e53418cf2668802cc7e1 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 17 Jul 2025 13:15:21 -0700 Subject: [PATCH 2/2] Really remove if --- .github/workflows/publish-release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index a5e3333..f48e09f 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -57,13 +57,11 @@ jobs: --skip-duplicate - name: Zip output - if: github.event_name != 'pull_request' run: | cp ./LanguageData/*.json ./Publish/ 7z a -t7z ./Publish/LanguageTags.7z ./Publish/* - name: Create GitHub release - if: github.event_name != 'pull_request' uses: softprops/action-gh-release@v2 with: generate_release_notes: true