From e6ab8743d1d3dc68870b811138cb2ae4ea9ef7f7 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 4 Mar 2025 09:18:37 +0000 Subject: [PATCH] Simplify workflows remove unused parameters (#2182) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_and_deploy.yaml | 1 - .github/workflows/build_and_test.yaml | 1 - .github/workflows/build_linux.yaml | 4 ---- .github/workflows/build_prepare.yaml | 7 ++----- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 7c45433a..a033aa04 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -92,7 +92,6 @@ jobs: uses: ./.github/workflows/build_linux.yaml with: arch: ${{ matrix.arch }} - config: ${{ needs.prepare.outputs.config }} sqlcipher: ${{ matrix.sqlcipher }} version: ${{ needs.prepare.outputs.nightly-version }} diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index ea480bdb..2d677d7f 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -35,7 +35,6 @@ jobs: sqlcipher: [system, static] arch: [amd64, arm64] with: - config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }} sqlcipher: ${{ matrix.sqlcipher }} arch: ${{ matrix.arch }} diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 7f434dd3..207fcf74 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -8,10 +8,6 @@ on: type: string required: true description: "The architecture to build for, one of 'amd64' | 'arm64'" - config: - type: string - required: true - description: "The config directory to use" version: type: string required: false diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index 4a28f26a..30c0b7cb 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -34,12 +34,9 @@ on: packages-dir: description: "The directory non-deb packages for this run should live in within packages.element.io" value: ${{ inputs.nightly && 'nightly' || 'desktop' }} - # These are just simple pass-throughs of the input to simplify reuse of complex inline conditions - config: - description: "The relative path to the config file for this run" - value: ${{ inputs.config }} + # This is just a simple pass-through of the input to simplify reuse of complex inline conditions deploy: - description: "The relative path to the config file for this run" + description: "Whether the build should be deployed to production" value: ${{ inputs.deploy }} permissions: {} jobs: