Skip to content

Commit 29768c3

Browse files
committed
Override config in GH actions rather than build scripts and fix passing accel to packaging action
1 parent dc0406a commit 29768c3

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/actions/package-plugin/action.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
acceleration:
1212
description: 'Enable acceleration'
1313
required: false
14-
default: 'cpu'
14+
default: 'generic'
1515
codesign:
1616
description: 'Enable codesigning (macOS only)'
1717
required: false
@@ -94,10 +94,15 @@ runs:
9494
: Run Ubuntu Packaging
9595
package_args=(
9696
--target linux-${{ inputs.target }}
97-
--config ${{ inputs.config }}
9897
)
9998
if (( ${+RUNNER_DEBUG} )) build_args+=(--debug)
10099
100+
if [[ '${{ inputs.acceleration }}' == 'amd']]
101+
then
102+
package_args+=(--config Release)
103+
else
104+
package_args+=(--config ${{ inputs.config }})
105+
fi
101106
if [[ '${{ inputs.package }}' == 'true' ]] package_args+=(--package)
102107
103108
.github/scripts/package-linux ${package_args}

.github/scripts/.build.zsh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@ ${_usage_host:-}"
147147
log_output ${_usage}
148148
exit 2
149149
}
150-
if [[ "${+ACCELERATION}" != "amd" ]]
151-
then
152-
config=${2}
153-
fi
150+
config=${2}
154151
shift 2
155152
;;
156153
-s|--codesign) codesign=1; shift ;;

.github/scripts/.package.zsh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,7 @@ ${_usage_host:-}"
141141
log_output ${_usage}
142142
exit 2
143143
}
144-
if [[ "${+ACCELERATION}" != "amd" ]]
145-
then
146-
config=${2}
147-
fi
144+
config=${2}
148145
shift 2
149146
;;
150147
-s|--codesign) typeset -g codesign=1; shift ;;

.github/workflows/build-project.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ jobs:
327327
package: ${{ fromJSON(needs.check-event.outputs.package) }}
328328
target: x86_64
329329
config: ${{ needs.check-event.outputs.config }}
330+
acceleration: ${{ matrix.acceleration }}
330331

331332
- name: Upload Source Tarball 🗜️
332333
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)