jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-22 06:43:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into tooomm-ci_sign_mac

Browse source
This commit is contained in:
tooomm 2026-06-20 22:51:26 +02:00 • committed by GitHub
commit a0d6c7fc8b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 42 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/desktop-build.yml vendored
View file

@ -49,24 +49,19 @@ jobs:
steps: steps:
- name: "Configure" - name: "Configure"
env:
RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }}
id: configure id: configure
shell: bash shell: bash
run: | run: |
tag_regex='^refs/tags/' if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then # release
if [[ $GITHUB_EVENT_NAME == pull-request ]]; then # pull request echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
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"
fi fi
echo "sha=$sha" >>"$GITHUB_OUTPUT" echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
- name: "Checkout" - name: "Checkout"
if: steps.configure.outputs.tag != null if: steps.configure.outputs.tag != null
uses: actions/checkout@v6 uses: actions/checkout@v7
with: with:
fetch-depth: 0 # fetch all history for all branches and tags fetch-depth: 0 # fetch all history for all branches and tags
@ -163,7 +158,7 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: "Restore compiler cache (ccache)" - name: "Restore compiler cache (ccache)"
id: ccache_restore id: ccache_restore
@ -349,7 +344,7 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v6 uses: actions/checkout@v7
with: with:
submodules: recursive submodules: recursive

2
.github/workflows/desktop-lint.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v6 uses: actions/checkout@v7
with: with:
fetch-depth: 20 # should be enough to find merge base fetch-depth: 20 # should be enough to find merge base

2
.github/workflows/docker-release.yml vendored
View file

@ -31,7 +31,7 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: "Docker metadata" - name: "Docker metadata"
id: metadata id: metadata

2
.github/workflows/documentation-build.yml vendored
View file

@ -21,7 +21,7 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@v6 uses: actions/checkout@v7
with: with:
submodules: recursive submodules: recursive

14
.github/workflows/translations-pull.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
steps: steps:
- name: "Checkout repo" - name: "Checkout repo"
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: "Pull translated strings from Transifex" - name: "Pull translated strings from Transifex"
uses: transifex/cli-action@v2 uses: transifex/cli-action@v2
@ -61,11 +61,9 @@ jobs:
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
shell: bash shell: bash
env: 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: | run: |
if [[ "$STATUS" == "none" ]]; then echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY echo "URL: $PR_URL" >> "$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

23
.github/workflows/translations-push.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
steps: steps:
- name: "Checkout repo" - name: "Checkout repo"
uses: actions/checkout@v6 uses: actions/checkout@v7
- name: "Install lupdate" - name: "Install lupdate"
shell: bash shell: bash
@ -29,12 +29,13 @@ jobs:
sudo apt-get install -y --no-install-recommends qttools5-dev-tools sudo apt-get install -y --no-install-recommends qttools5-dev-tools
- name: "Update Cockatrice translation source" - name: "Update Cockatrice translation source"
env:
FILE: cockatrice/cockatrice_en@source.ts
id: cockatrice id: cockatrice
shell: bash shell: bash
run: | run: >
FILE="cockatrice/cockatrice_en@source.ts" DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')" .ci/update_translation_source_strings.sh
FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
- name: "Update Oracle translation source" - name: "Update Oracle translation source"
id: oracle id: oracle
@ -77,11 +78,9 @@ jobs:
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
shell: bash shell: bash
env: 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: | run: |
if [[ "$STATUS" == "none" ]]; then echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY echo "URL: $PR_URL" >> "$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