jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 12:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

harmonize and simplify more if conditions

Browse source
This commit is contained in:
tooomm 2026-07-03 19:27:27 +02:00
parent 62dc1c29f5
commit c3ad667969
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,21 +60,21 @@ jobs:
echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT" echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
- name: "Checkout" - name: "Checkout"
if: steps.configure.outputs.tag != null if: steps.configure.outputs.tag
uses: actions/checkout@v7 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
- name: "Prepare release parameters" - name: "Prepare release parameters"
id: prepare id: prepare
if: steps.configure.outputs.tag != null if: steps.configure.outputs.tag
shell: bash shell: bash
env: env:
TAG: ${{ steps.configure.outputs.tag }} TAG: ${{ steps.configure.outputs.tag }}
run: .ci/prep_release.sh run: .ci/prep_release.sh
- name: "Create release" - name: "Create release"
if: steps.configure.outputs.tag != null if: steps.configure.outputs.tag
id: create_release id: create_release
shell: bash shell: bash
env: env:
@ -202,7 +202,7 @@ jobs:
# Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
- name: "Delete remote compiler cache (ccache)" - name: "Delete remote compiler cache (ccache)"
if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit if: github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit == 'true'
continue-on-error: true continue-on-error: true
env: env:
CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }} CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@ -230,7 +230,7 @@ jobs:
- name: "Upload to release" - name: "Upload to release"
id: upload_release id: upload_release
if: matrix.package && needs.configure.outputs.tag != null if: matrix.package && needs.configure.outputs.tag
shell: bash shell: bash
env: env:
ASSET_NAME: ${{ steps.build.outputs.fullname }} ASSET_NAME: ${{ steps.build.outputs.fullname }}
@ -452,7 +452,7 @@ jobs:
# Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342 # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
- name: "[macOS] Delete remote compiler cache (ccache)" - name: "[macOS] Delete remote compiler cache (ccache)"
if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit if: matrix.os == 'macOS' && matrix.use_ccache == true && github.ref == 'refs/heads/master' && steps.ccache_restore.outputs.cache-hit == 'true'
continue-on-error: true continue-on-error: true
env: env:
CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }} CACHE_PRIMARY_KEY: ${{ steps.ccache_restore.outputs.cache-primary-key }}
@ -470,7 +470,7 @@ jobs:
path: ${{ env.CCACHE_DIR }} path: ${{ env.CCACHE_DIR }}
- name: "[macOS] Sign app bundle" - name: "[macOS] Sign app bundle"
if: matrix.os == 'macOS' && matrix.make_package == true && needs.configure.outputs.tag != null if: matrix.os == 'macOS' && matrix.make_package == true && needs.configure.outputs.tag
id: sign_macos id: sign_macos
env: env:
BUILD_PATH: ${{ steps.build.outputs.path }} BUILD_PATH: ${{ steps.build.outputs.path }}
@ -537,7 +537,7 @@ jobs:
build/servatrice/Release/*.pdb build/servatrice/Release/*.pdb
- name: "Upload to release" - name: "Upload to release"
if: matrix.make_package == true && needs.configure.outputs.tag != null if: matrix.make_package == true && needs.configure.outputs.tag
id: upload_release id: upload_release
shell: bash shell: bash
env: env: