diff --git a/.github/workflows/linux-publish.yml b/.github/workflows/linux-publish.yml index 6af78c80fc3..b9e56c3f94a 100644 --- a/.github/workflows/linux-publish.yml +++ b/.github/workflows/linux-publish.yml @@ -41,6 +41,7 @@ jobs: uses: ./.github/workflows/pipeline-segment-electron-build.yml needs: checkout-linux with: + environment: production-release build-runs-on: aks-linux-large build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}' target-platform: linux @@ -55,6 +56,7 @@ jobs: uses: ./.github/workflows/pipeline-segment-electron-build.yml needs: checkout-linux with: + environment: production-release build-runs-on: aks-linux-large build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}' target-platform: linux @@ -69,6 +71,7 @@ jobs: uses: ./.github/workflows/pipeline-segment-electron-build.yml needs: checkout-linux with: + environment: production-release build-runs-on: aks-linux-large build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}' target-platform: linux diff --git a/.github/workflows/macos-publish.yml b/.github/workflows/macos-publish.yml index d71e0c4984c..43b19a5f330 100644 --- a/.github/workflows/macos-publish.yml +++ b/.github/workflows/macos-publish.yml @@ -44,6 +44,7 @@ jobs: uses: ./.github/workflows/pipeline-segment-electron-build.yml needs: checkout-macos with: + environment: production-release build-runs-on: macos-14-xlarge target-platform: macos target-arch: x64 @@ -57,6 +58,7 @@ jobs: uses: ./.github/workflows/pipeline-segment-electron-build.yml needs: checkout-macos with: + environment: production-release build-runs-on: macos-14-xlarge target-platform: macos target-arch: arm64 diff --git a/.github/workflows/pipeline-segment-electron-build.yml b/.github/workflows/pipeline-segment-electron-build.yml index 0707615e51a..6fb6db6c14d 100644 --- a/.github/workflows/pipeline-segment-electron-build.yml +++ b/.github/workflows/pipeline-segment-electron-build.yml @@ -3,6 +3,10 @@ name: Pipeline Segment - Electron Build on: workflow_call: inputs: + environment: + description: using the production or testing environment + required: false + type: string target-platform: type: string description: 'Platform to run on, can be macos or linux' @@ -64,6 +68,7 @@ jobs: build: runs-on: ${{ inputs.build-runs-on }} container: ${{ fromJSON(inputs.build-container) }} + environment: ${{ inputs.environment }} env: TARGET_ARCH: ${{ inputs.target-arch }} steps: @@ -92,9 +97,9 @@ jobs: if: ${{ inputs.target-platform == 'linux' }} run: | if [ "${{ inputs.target-arch }}" = "arm" ]; then - GN_EXTRA_ARGS='build_tflite_with_xnnpack=false' + GN_EXTRA_ARGS='target_cpu="arm" build_tflite_with_xnnpack=false' elif [ "${{ inputs.target-arch }}" = "arm64" ]; then - GN_EXTRA_ARGS='fatal_linker_warnings=false enable_linux_installer=false' + GN_EXTRA_ARGS='target_cpu="arm64" fatal_linker_warnings=false enable_linux_installer=false' fi echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV - name: Get Depot Tools