From 63f8fb6ddeb63756aa3f24562142360281f0d507 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 5 Feb 2024 15:26:13 +0100 Subject: [PATCH] add required fake-prerelease inputs for nrjmx based integrations (#51) --- .../workflows/_test_build_fake_prerelease.yaml | 15 ++++++++++++++- .github/workflows/reusable_push_pr.yaml | 10 ++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/_test_build_fake_prerelease.yaml b/.github/workflows/_test_build_fake_prerelease.yaml index 3325ab1..87f2794 100644 --- a/.github/workflows/_test_build_fake_prerelease.yaml +++ b/.github/workflows/_test_build_fake_prerelease.yaml @@ -6,6 +6,13 @@ on: integration: required: true type: string + goarch_matrix: + required: true + type: string + download_nrjmx: + required: false + type: boolean + default: false secrets: OHAI_PFX_CERTIFICATE_BASE64: required: true @@ -52,7 +59,7 @@ jobs: working-directory: src/github.com/${{ github.event.repository.full_name }} strategy: matrix: - goarch: [ amd64,386 ] + goarch: ${{ fromJSON(inputs.goarch_matrix) }} steps: - name: Checkout uses: actions/checkout@v4 @@ -79,6 +86,12 @@ jobs: - name: Extract .exe shell: pwsh run: build\windows\extract_exe.ps1 "$env:INTEGRATION" ${{ matrix.goarch }} "$env:TAG" + + - name: Download nrjmx + if: ${{ inputs.download_nrjmx }} + shell: bash + run: build/windows/download_nrjmx.sh + - name: Create MSI shell: pwsh run: build\windows\package_msi.ps1 -integration "$env:INTEGRATION" -arch ${{ matrix.goarch }} -tag "$env:TAG" -pfx_passphrase "$env:PFX_PASSPHRASE" -pfx_certificate_description "$env:PFX_CERTIFICATE_DESCRIPTION" diff --git a/.github/workflows/reusable_push_pr.yaml b/.github/workflows/reusable_push_pr.yaml index 30791dc..85fa87a 100644 --- a/.github/workflows/reusable_push_pr.yaml +++ b/.github/workflows/reusable_push_pr.yaml @@ -25,6 +25,14 @@ on: required: false type: boolean default: false + fake_prerelease_goarch_matrix: + required: false + type: string + default: '["amd64", "386"]' + fake_prerelease_download_nrjmx: + required: false + type: boolean + default: false secrets: OHAI_PFX_CERTIFICATE_BASE64: required: false @@ -58,3 +66,5 @@ jobs: OHAI_PFX_PASSPHRASE: ${{ secrets.OHAI_PFX_PASSPHRASE }} with: integration: ${{ inputs.integration }} + goarch_matrix: ${{ inputs.fake_prerelease_goarch_matrix }} + download_nrjmx: ${{ inputs.fake_prerelease_download_nrjmx }}