mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: use BUILD_TYPE from env (#42498)

Browse source 
build: use BUILD_TYPE from env
This commit is contained in:
Shelley Vohr 2024-06-14 06:47:18 -05:00 • committed by GitHub
parent 9f862af743
commit 422511753f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/pipeline-segment-node-nan-test.yml vendored
View file

@ -41,6 +41,7 @@ jobs:
timeout-minutes: 20 timeout-minutes: 20
env: env:
TARGET_ARCH: ${{ inputs.target-arch }} TARGET_ARCH: ${{ inputs.target-arch }}
BUILD_TYPE: linux
container: ${{ fromJSON(inputs.test-container) }} container: ${{ fromJSON(inputs.test-container) }}
steps: steps:
- name: Load Build Tools - name: Load Build Tools
@ -71,8 +72,8 @@ jobs:
- name: Download Generated Artifacts - name: Download Generated Artifacts
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
with: with:
name: generated_artifacts_linux_${{ env.TARGET_ARCH }} name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
path: ./generated_artifacts_linux_${{ env.TARGET_ARCH }} path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
- name: Download Src Artifacts - name: Download Src Artifacts
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
with: with:
@ -103,6 +104,7 @@ jobs:
timeout-minutes: 20 timeout-minutes: 20
env: env:
TARGET_ARCH: ${{ inputs.target-arch }} TARGET_ARCH: ${{ inputs.target-arch }}
BUILD_TYPE: linux
container: ${{ fromJSON(inputs.test-container) }} container: ${{ fromJSON(inputs.test-container) }}
steps: steps:
- name: Load Build Tools - name: Load Build Tools
@ -133,8 +135,8 @@ jobs:
- name: Download Generated Artifacts - name: Download Generated Artifacts
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
with: with:
name: generated_artifacts_linux_${{ env.TARGET_ARCH }} name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
path: ./generated_artifacts_linux_${{ env.TARGET_ARCH }} path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
- name: Download Src Artifacts - name: Download Src Artifacts
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
with: with:

13
script/actions/restore-artifacts.sh
View file

@ -1,18 +1,5 @@
#!/bin/bash #!/bin/bash
if [ "`uname`" == "Darwin" ]; then
if [ -z "$MAS_BUILD" ]; then
BUILD_TYPE="darwin"
else
BUILD_TYPE="mas"
fi
elif [ "`uname`" == "Linux" ]; then
BUILD_TYPE="linux"
else
echo "Unsupported platform"
exit 1
fi
GENERATED_ARTIFACTS="generated_artifacts_${BUILD_TYPE}_${TARGET_ARCH}" GENERATED_ARTIFACTS="generated_artifacts_${BUILD_TYPE}_${TARGET_ARCH}"
SRC_ARTIFACTS="src_artifacts_${BUILD_TYPE}_${TARGET_ARCH}" SRC_ARTIFACTS="src_artifacts_${BUILD_TYPE}_${TARGET_ARCH}"