Skip to content

Commit 730ae86

Browse files
committed
Merge branch 'fix_target_builds' into try_fix_macos_builds
2 parents 060ffbd + 872e335 commit 730ae86

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

.github/workflows/manual-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ on:
4949
environment:
5050
description: Environment to run build
5151
type: environment
52-
default: 'staging'
52+
default: 'development'
5353
required: false
5454

5555
debug:

.github/workflows/pipeline-build-linux.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,9 @@ jobs:
6969
- name: Build linux packages (custom)
7070
if: inputs.target != vars.ALL
7171
run: |
72-
target=""
73-
if [ ${{ startsWith(inputs.target, 'linux:') }} == 'true' ]; then
74-
inputsTarget=${{inputs.target}}
75-
target=${inputsTarget#linux:}
76-
fi
72+
target=$(echo "${{inputs.target}}" | grep -oE 'build_linux_[^_ ]+' | sed 's/build_linux_//' | sort -u | paste -sd ' ' -)
7773
78-
if [ ${{ contains(vars.ENV, 'production') }} ]; then
74+
if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
7975
yarn package:prod --linux $target
8076
else
8177
yarn package:stage --linux $target

.github/workflows/pipeline-build-macos.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,9 @@ jobs:
8080
if: inputs.target != vars.ALL
8181
run: |
8282
unset CSC_LINK
83-
target=""
83+
target=$(echo "${{inputs.target}}" | grep -oE 'build_macos_[^ ]+' | sed 's/build_macos_/dmg:/' | paste -sd ' ' -)
8484
85-
if [ ${{ startsWith(inputs.target, 'macos:') }} == 'true' ]; then
86-
inputsTarget=${{inputs.target}}
87-
target=--${inputsTarget#macos:}
88-
fi
89-
90-
if [ ${{ contains(vars.ENV, 'production') }} ]; then
85+
if [ "${{ vars.ENV == 'production' }}" == "true" ]; then
9186
yarn package:prod --mac $target
9287
else
9388
yarn package:stage --mac $target

0 commit comments

Comments
 (0)