From f03b26dc3b62eeec722e861a6511163fea0e2c2f Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 10 Jun 2026 20:09:44 +0900 Subject: [PATCH 1/2] ci: update package --- .github/workflows/build.yml | 6 +++--- .github/workflows/publish.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32658cd..e0434b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,16 +18,16 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: microsoft java-version: 17 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: 10.0.x diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c383c09..26d3d73 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Parse version and tag id: ver @@ -50,13 +50,13 @@ jobs: Write-Host "Release tag: $tagV | Version: $num | ApplicationVersion (code): $code" - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: microsoft java-version: 17 - name: Setup .NET SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: 10.0.x From c41359dad7e5fb2a919e6c924733d86259d1733a Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 10 Jun 2026 20:31:24 +0900 Subject: [PATCH 2/2] ci: refine to Cysharp GitHub Actions style --- .github/workflows/build.yml | 22 ++++++++++++++++----- .github/workflows/prevent-github-change.yml | 13 ++++++++++++ .github/workflows/publish.yml | 18 +++++++++-------- 3 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/prevent-github-change.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0434b5..6ac5a96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,19 +15,22 @@ on: jobs: dotnet-build: - runs-on: windows-latest + permissions: + contents: read + runs-on: ubuntu-24.04 + timeout-minutes: 20 steps: - name: Checkout - uses: actions/checkout@v6 + uses: Cysharp/Actions/.github/actions/checkout@main - name: Setup Java - uses: actions/setup-java@v5 + uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: microsoft java-version: 17 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: Cysharp/Actions/.github/actions/setup-dotnet@main with: dotnet-version: 10.0.x @@ -82,8 +85,17 @@ jobs: "apk_path=$($pick.FullName)" >> $env:GITHUB_OUTPUT - name: Upload signed APK - uses: actions/upload-artifact@v7 + uses: Cysharp/Actions/.github/actions/upload-artifact@main with: + name: ringcontroller-apk path: ${{ steps.signed_apk.outputs.apk_path }} archive: false if-no-files-found: error + + actions-timeline: + needs: [dotnet-build] + permissions: + contents: read + uses: Cysharp/Actions/.github/workflows/actions-timeline.yaml@main + secrets: + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/prevent-github-change.yml b/.github/workflows/prevent-github-change.yml new file mode 100644 index 0000000..2a8d6f7 --- /dev/null +++ b/.github/workflows/prevent-github-change.yml @@ -0,0 +1,13 @@ +name: Prevent .github change + +on: + pull_request: + paths: + - ".github/**/*.yaml" + - ".github/**/*.yml" + +jobs: + detect: + permissions: + contents: read + uses: Cysharp/Actions/.github/workflows/prevent-github-change.yaml@main diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 26d3d73..9f2f091 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,25 +11,25 @@ on: required: true type: string -permissions: - contents: write - concurrency: group: publish-release cancel-in-progress: false jobs: publish: - runs-on: windows-latest + permissions: + contents: write + runs-on: ubuntu-24.04 + timeout-minutes: 30 steps: - name: Checkout - uses: actions/checkout@v6 + uses: Cysharp/Actions/.github/actions/checkout@main - name: Parse version and tag id: ver shell: pwsh run: | - $raw = "${{ inputs.tag }}".Trim() + $raw = "$env:TAG".Trim() if ([string]::IsNullOrWhiteSpace($raw)) { throw "tag is required" } if ($raw -match '^v\d') { $tagV = $raw @@ -49,14 +49,16 @@ jobs: "app_version=$code" >> $env:GITHUB_OUTPUT Write-Host "Release tag: $tagV | Version: $num | ApplicationVersion (code): $code" + env: + TAG: ${{ inputs.tag }} - name: Setup Java - uses: actions/setup-java@v5 + uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: microsoft java-version: 17 - name: Setup .NET SDK - uses: actions/setup-dotnet@v5 + uses: Cysharp/Actions/.github/actions/setup-dotnet@main with: dotnet-version: 10.0.x