From 2a3c4a2455431dd2115e6e4fc59be709fa6791ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jun 2026 19:11:10 +0200 Subject: [PATCH 1/2] Bump actions/checkout from 6 to 7 (#7011) --- .github/workflows/desktop-build.yml | 6 +++--- .github/workflows/desktop-lint.yml | 2 +- .github/workflows/docker-release.yml | 2 +- .github/workflows/documentation-build.yml | 2 +- .github/workflows/translations-pull.yml | 2 +- .github/workflows/translations-push.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 11b5b2213..7af521b39 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -66,7 +66,7 @@ jobs: - name: "Checkout" if: steps.configure.outputs.tag != null - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 0 # fetch all history for all branches and tags @@ -163,7 +163,7 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Restore compiler cache (ccache)" id: ccache_restore @@ -352,7 +352,7 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: submodules: recursive diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml index 54931933c..5f31ea59c 100644 --- a/.github/workflows/desktop-lint.yml +++ b/.github/workflows/desktop-lint.yml @@ -22,7 +22,7 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: fetch-depth: 20 # should be enough to find merge base diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index d9ff06282..b479322d0 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -31,7 +31,7 @@ jobs: steps: - name: "Checkout" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Docker metadata" id: metadata diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml index 717999d5a..4b9ca79ab 100644 --- a/.github/workflows/documentation-build.yml +++ b/.github/workflows/documentation-build.yml @@ -21,7 +21,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: submodules: recursive diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml index 057381f8a..7b082e9cd 100644 --- a/.github/workflows/translations-pull.yml +++ b/.github/workflows/translations-pull.yml @@ -20,7 +20,7 @@ jobs: steps: - name: "Checkout repo" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Pull translated strings from Transifex" uses: transifex/cli-action@v2 diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml index 4adcaf4a4..5a6ca342b 100644 --- a/.github/workflows/translations-push.yml +++ b/.github/workflows/translations-push.yml @@ -20,7 +20,7 @@ jobs: steps: - name: "Checkout repo" - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: "Install lupdate" shell: bash From e99a55ccabd1f81e2f15da1d53a3c869d7f53dd2 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Sat, 20 Jun 2026 15:44:37 -0500 Subject: [PATCH 2/2] CI: Simplified build workflow (#6995) * simplified build workflow * cleaned up translation workflows * fixed typo * updated format based on code review Co-authored-by: tooomm * restored quotes around `group` string --------- Co-authored-by: tooomm --- .github/workflows/desktop-build.yml | 47 +++++++++++-------------- .github/workflows/translations-pull.yml | 16 ++++----- .github/workflows/translations-push.yml | 21 ++++++----- 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 7af521b39..74f905351 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -47,22 +47,17 @@ jobs: tag: ${{ steps.configure.outputs.tag }} sha: ${{ steps.configure.outputs.sha }} - steps: + steps: - name: "Configure" + env: + RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }} id: configure shell: bash run: | - tag_regex='^refs/tags/' - if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request - sha="${{github.event.pull_request.head.sha}}" - elif [[ $GITHUB_REF =~ $tag_regex ]]; then # release - sha="$GITHUB_SHA" - tag="${GITHUB_REF/refs\/tags\//}" - echo "tag=$tag" >>"$GITHUB_OUTPUT" - else # push to branch - sha="$GITHUB_SHA" + if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then # release + echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT" fi - echo "sha=$sha" >>"$GITHUB_OUTPUT" + echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT" - name: "Checkout" if: steps.configure.outputs.tag != null @@ -92,7 +87,7 @@ jobs: run: | args=() [[ $prerelease == yes ]] && args+=(--prerelease) - + gh release create "$tag_name" --verify-tag --draft "${args[@]}" \ --target "$target" \ --title "$release_name" \ @@ -105,48 +100,48 @@ jobs: # The files in ".ci/$distro$version" correspond to the values given here include: - distro: Arch - + allow-failure: yes package: skip # We are packaged in Arch already - distro: Servatrice_Debian version: 12 - + package: DEB server_only: yes test: skip - distro: Debian version: 12 - + package: DEB test: skip # Running tests on all distros is superfluous - distro: Debian version: 13 - + package: DEB - distro: Fedora version: 43 - + package: RPM test: skip # Running tests on all distros is superfluous - distro: Fedora version: 44 - + package: RPM - distro: Ubuntu version: 24.04 - + package: DEB test: skip # Running tests on all distros is superfluous - distro: Ubuntu version: 26.04 - + package: DEB name: ${{ matrix.distro }} ${{ matrix.version }} @@ -203,7 +198,7 @@ jobs: args+=(--ccache "$CCACHE_SIZE") args+=(--cmake-generator "$CMAKE_GENERATOR") args+=(--suffix "$SUFFIX") - + RUN --server --release --package "$package" "${args[@]}" # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 @@ -269,7 +264,7 @@ jobs: - os: macOS target: 13 runner: macos-15-intel - + ccache_eviction_age: 7d cmake_generator: Ninja make_package: 1 @@ -286,7 +281,7 @@ jobs: - os: macOS target: 14 runner: macos-14 - + ccache_eviction_age: 7d cmake_generator: Ninja make_package: 1 @@ -302,7 +297,7 @@ jobs: - os: macOS target: 15 runner: macos-15 - + ccache_eviction_age: 7d cmake_generator: Ninja make_package: 1 @@ -318,7 +313,7 @@ jobs: - os: macOS target: 15 runner: macos-15 - + ccache_eviction_age: 7d cmake_generator: Ninja qt_version: 6.11.0 @@ -332,7 +327,7 @@ jobs: - os: Windows target: 10 runner: windows-2025 - + cmake_generator: "Visual Studio 18 2026" cmake_generator_platform: x64 make_package: 1 diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml index 7b082e9cd..57df31bf0 100644 --- a/.github/workflows/translations-pull.yml +++ b/.github/workflows/translations-pull.yml @@ -41,11 +41,11 @@ jobs: author: github-actions # owner of the commit body: | Pulled all translated strings from [Transifex][1]. - + --- *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*
*After merging, all new languages and translations are available in the next build.* - + [1]: https://explore.transifex.com/cockatrice/cockatrice/ [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster branch: ci-update_translations @@ -61,11 +61,9 @@ jobs: if: github.event_name != 'pull_request' shell: bash env: - STATUS: ${{ steps.create_pr.outputs.pull-request-operation }} + PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }} + PR_URL: ${{ steps.create_pr.outputs.pull-request-url }} + STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }} run: | - if [[ "$STATUS" == "none" ]]; then - echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY - else - echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY - fi - echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY + echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY" + echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY" diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml index 5a6ca342b..c4d3f61fb 100644 --- a/.github/workflows/translations-push.yml +++ b/.github/workflows/translations-push.yml @@ -29,12 +29,13 @@ jobs: sudo apt-get install -y --no-install-recommends qttools5-dev-tools - name: "Update Cockatrice translation source" + env: + FILE: cockatrice/cockatrice_en@source.ts id: cockatrice shell: bash - run: | - FILE="cockatrice/cockatrice_en@source.ts" - export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')" - FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh + run: > + DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')" + .ci/update_translation_source_strings.sh - name: "Update Oracle translation source" id: oracle @@ -77,11 +78,9 @@ jobs: if: github.event_name != 'pull_request' shell: bash env: - STATUS: ${{ steps.create_pr.outputs.pull-request-operation }} + PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }} + PR_URL: ${{ steps.create_pr.outputs.pull-request-url }} + STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }} run: | - if [[ "$STATUS" == "none" ]]; then - echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY - else - echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY - fi - echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY + echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY" + echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"