ci: remove unneeded brackets in if statements

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
This commit is contained in:
Paul Meyer 2023-01-17 18:49:00 +01:00
parent f5623fee5a
commit 41690288a1
15 changed files with 33 additions and 33 deletions

View File

@ -55,7 +55,7 @@ runs:
- name: Install Cosign
uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # v2.8.1
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Build apko images and sign them
run: |
@ -156,7 +156,7 @@ runs:
COSIGN_PUBLIC_KEY: ${{ inputs.cosignPublicKey }}
COSIGN_PRIVATE_KEY: ${{ inputs.cosignPrivateKey }}
COSIGN_PASSWORD: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Upload SBOMs
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2

View File

@ -59,7 +59,7 @@ runs:
# once it has the functionality
- name: Install Cosign
uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # tag=v2.8.1
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Install Rekor
run: |
@ -70,7 +70,7 @@ runs:
rm rekor-cli-${HOSTOS}-${HOSTARCH}
shell: bash
working-directory: build
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Sign CLI
run: |
@ -91,4 +91,4 @@ runs:
COSIGN_PUBLIC_KEY: ${{ inputs.cosignPublicKey }}
COSIGN_PRIVATE_KEY: ${{ inputs.cosignPrivateKey }}
COSIGN_PASSWORD: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''

View File

@ -74,4 +74,4 @@ runs:
cosignPublicKey: ${{ inputs.cosignPublicKey }}
cosignPrivateKey: ${{ inputs.cosignPrivateKey }}
cosignPassword: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''

View File

@ -76,4 +76,4 @@ runs:
cosignPublicKey: ${{ inputs.cosignPublicKey }}
cosignPrivateKey: ${{ inputs.cosignPrivateKey }}
cosignPassword: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' && inputs.generateKoSBOM == 'false' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' && inputs.generateKoSBOM == 'false'

View File

@ -72,10 +72,10 @@ runs:
cosignPublicKey: ${{ inputs.cosignPublicKey }}
cosignPrivateKey: ${{ inputs.cosignPrivateKey }}
cosignPassword: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Bundle for pseudo version
if: ${{ steps.pseudo-version.outputs.pseudoVersion != '' && inputs.pushTag == '' }}
if: steps.pseudo-version.outputs.pseudoVersion != '' && inputs.pushTag == ''
shell: bash
run: make bundle VERSION=${VERSION#v}
working-directory: ${{ inputs.sourceDir }}
@ -83,7 +83,7 @@ runs:
VERSION: ${{ steps.pseudo-version.outputs.pseudoVersion }}
- name: Bundle for semantic version
if: ${{ inputs.pushTag != '' }}
if: inputs.pushTag != ''
shell: bash
run: make bundle VERSION=${VERSION#v}
working-directory: ${{ inputs.sourceDir }}
@ -118,10 +118,10 @@ runs:
cosignPublicKey: ${{ inputs.cosignPublicKey }}
cosignPrivateKey: ${{ inputs.cosignPrivateKey }}
cosignPassword: ${{ inputs.cosignPassword }}
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Build and push catalog for pseudo versions
if: ${{ steps.pseudo-version.outputs.pseudoVersion != '' && inputs.pushTag == '' }}
if: steps.pseudo-version.outputs.pseudoVersion != '' && inputs.pushTag == ''
shell: bash
run: make VERSION=${VERSION#v} catalog-build catalog-push
working-directory: ${{ inputs.sourceDir }}
@ -129,7 +129,7 @@ runs:
VERSION: ${{ steps.pseudo-version.outputs.pseudoVersion }}
- name: Build and push catalog for releases
if: ${{ inputs.pushTag != '' }}
if: inputs.pushTag != ''
shell: bash
run: make VERSION=${VERSION#v} catalog-build catalog-push
working-directory: ${{ inputs.sourceDir }}

View File

@ -100,7 +100,7 @@ runs:
- name: Remove embedded measurements
shell: bash
if: ${{ inputs.keepMeasurements == 'false' }}
if: inputs.keepMeasurements == 'false'
run: |
yq eval -i \
"(.provider | select(. | has(\"aws\")).aws.measurements) = {15:{\"expected\":\"0000000000000000000000000000000000000000000000000000000000000000\",\"warnOnly\":false}}" \
@ -125,7 +125,7 @@ runs:
run: yq eval -i "(.image) = \"${image}\"" constellation-conf.yaml
- name: Set instanceType
if: ${{ inputs.machineType && inputs.machineType != 'default' }}
if: inputs.machineType && inputs.machineType != 'default'
shell: bash
run: |
yq eval -i "(.provider | select(. | has(\"azure\")).azure.instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml
@ -133,7 +133,7 @@ runs:
yq eval -i "(.provider | select(. | has(\"aws\")).aws.instanceType) = \"${{ inputs.machineType }}\"" constellation-conf.yaml
- name: Create serviceAccountKey.json
if: ${{ inputs.cloudProvider == 'gcp' }}
if: inputs.cloudProvider == 'gcp'
shell: bash
env:
GCP_CLUSTER_SERVICE_ACCOUNT_KEY: ${{ inputs.gcpClusterServiceAccountKey }}
@ -141,7 +141,7 @@ runs:
echo "$GCP_CLUSTER_SERVICE_ACCOUNT_KEY" > serviceAccountKey.json
- name: Enable debugCluster flag
if: ${{ inputs.isDebugImage == 'true' }}
if: inputs.isDebugImage == 'true'
shell: bash
run: |
yq eval -i '(.debugCluster) = true' constellation-conf.yaml
@ -155,7 +155,7 @@ runs:
constellation create -c ${{ inputs.controlNodesCount }} -w ${{ inputs.workerNodesCount }} --name e2e-test -y
- name: Cdbg deploy
if: ${{ inputs.isDebugImage == 'true' }}
if: inputs.isDebugImage == 'true'
shell: bash
run: |
echo "::group::cdbg deploy"
@ -203,7 +203,7 @@ runs:
echo "::endgroup::"
- name: Download boot logs
if: ${{ always() }}
if: always()
continue-on-error: true
shell: bash
env:
@ -225,7 +225,7 @@ runs:
echo "::endgroup::"
- name: Upload boot logs
if: ${{ always() && !env.ACT }}
if: always() && !env.ACT
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with:
name: serial-logs-${{ inputs.cloudProvider }}

View File

@ -19,7 +19,7 @@ runs:
steps:
- name: Install Cosign
uses: sigstore/cosign-installer@9becc617647dfa20ae7b1151972e9b3a2c338a2b # tag=v2.8.1
if: ${{ inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != '' }}
if: inputs.cosignPublicKey != '' && inputs.cosignPrivateKey != '' && inputs.cosignPassword != ''
- name: Download syft & grype
run: |
SYFT_VERSION=0.59.0

View File

@ -69,7 +69,7 @@ runs:
- name: Upload original benchmark results
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: ${{ !env.ACT }}
if: (!env.ACT)
with:
path: "k-bench/out/kbench-constellation-${{ inputs.cloudProvider }}"
name: "k-bench-constellation-${{ inputs.cloudProvider }}"
@ -114,7 +114,7 @@ runs:
- name: Upload benchmark results and graphs to action run
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
if: ${{ !env.ACT }}
if: (!env.ACT)
with:
path: |
benchmarks/*_perf.png

View File

@ -44,14 +44,14 @@ runs:
run: sonobuoy retrieve --kubeconfig constellation-admin.conf
- name: Upload test results
if: ${{ always() && !env.ACT }}
if: always() && !env.ACT
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with:
name: "sonobuoy_logs_${{ inputs.cloudProvider}}.tar.gz"
path: "*_sonobuoy_*.tar.gz"
- name: Publish test results
if: ${{ !env.ACT }}
if: (!env.ACT)
uses: mikepenz/action-junit-report@7210fead7f92f6395c37241964df3b0f730f5e4e # v3.7.1
with:
report_paths: "**/junit_01.xml"

View File

@ -72,7 +72,7 @@ runs:
using: "composite"
steps:
- name: Check input
if: ${{ !contains(fromJson('["sonobuoy full", "sonobuoy quick", "autoscaling", "k-bench", "verify", "lb", "nop"]'), inputs.test) }}
if: (!contains(fromJson('["sonobuoy full", "sonobuoy quick", "autoscaling", "k-bench", "verify", "lb", "nop"]'), inputs.test))
shell: bash
run: |
echo "Invalid input for test field: ${{ inputs.test }}"

View File

@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
- name: Setup Go environment
if: ${{ matrix.language == 'go' }}
if: matrix.language == 'go'
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: "1.19.5"
@ -37,7 +37,7 @@ jobs:
languages: ${{ matrix.language }}
- name: Install Go Dependencies
if: ${{ matrix.language == 'go' }}
if: matrix.language == 'go'
run: |
echo "::group::Install apt dependencies"
sudo apt-get update && sudo apt-get install -y libcryptsetup12 libcryptsetup-dev libvirt-dev

View File

@ -105,7 +105,7 @@ jobs:
kubeconfig: ${{ steps.e2e_test.outputs.kubeconfig }}
- name: Notify teams channel
if: ${{ failure() && github.ref == 'refs/heads/main' }}
if: failure() && github.ref == 'refs/heads/main'
continue-on-error: true
shell: bash
working-directory: .github/actions/e2e_test

View File

@ -143,7 +143,7 @@ jobs:
kubeconfig: ${{ steps.e2e_test.outputs.kubeconfig }}
- name: Notify teams channel
if: ${{ failure() && github.ref == 'refs/heads/main' }}
if: failure() && github.ref == 'refs/heads/main'
continue-on-error: true
shell: bash
working-directory: .github/actions/e2e_test

View File

@ -53,7 +53,7 @@ jobs:
git diff --exit-code
- name: Push changes on renovate
if: ${{ failure() && (steps.hcl-lock.conclusion == 'failure') && startsWith(github.head_ref, 'renovate/') }}
if: failure() && (steps.hcl-lock.conclusion == 'failure') && startsWith(github.head_ref, 'renovate/')
shell: bash
run: |
git config --global user.name "renovate[bot]"

View File

@ -39,7 +39,7 @@ jobs:
echo "EXISTS=$(if [[ -z "$ex" ]]; then echo 0; else echo 1; fi)" >> "$GITHUB_ENV"
- name: Publish new reference (create new branch)
if: ${{ env.EXISTS == 0 }}
if: env.EXISTS == 0
uses: dmnemec/copy_file_to_another_repo_action@c93037aa10fa8893de271f19978c980d0c1a9b37 # tag=v1.1.1
env:
API_TOKEN_GITHUB: ${{ secrets.CI_GITHUB_REPOSITORY }}
@ -53,7 +53,7 @@ jobs:
commit_message: "CLI reference was updated by edgelesssys/constellation@${{ env.COMMIT_END}}"
- name: Publish new reference (update branch)
if: ${{ env.EXISTS == 1 }}
if: env.EXISTS == 1
uses: dmnemec/copy_file_to_another_repo_action@c93037aa10fa8893de271f19978c980d0c1a9b37 # tag=v1.1.1
env:
API_TOKEN_GITHUB: ${{ secrets.CI_GITHUB_REPOSITORY }}