From 220cd35306e7f1ac6bdc9a4a0cb44ea12aa557ba Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 3 Jan 2025 17:12:54 +0800 Subject: [PATCH] fix(ci): weird formatting issues (#2864) * feat(ci): add mock label to ci, also remove multilib * feat: switch packages to use `arches = [...]` * ??? Signed-off-by: madomado * feat: add mock labels to pkgs * feat: add condition for setup scripts and dnf builddep * fix(ci): weird formatting issues * wha * if !contains? * single quotes --------- Signed-off-by: madomado --- .github/workflows/autobuild.yml | 4 ++-- .github/workflows/json-build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 317f876dc5..ba843ec1e2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -56,7 +56,7 @@ jobs: run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: CI Setup Script - if: !matrix.pkg.labels ["mock"] + if: ${{ !contains(matrix.pkg.labels, 'mock') }} run: | dir=$(dirname ${{ matrix.pkg.pkg }}) if [ -f $dir/ci_setup.rhai ]; then @@ -64,7 +64,7 @@ jobs: fi - name: Install Build Dependencies - if: !matrix.pkg.labels ["mock"] + if: ${{ !contains(matrix.pkg.labels, 'mock') }} run: | dir=$(dirname ${{ matrix.pkg.pkg }}) dnf5 builddep -y ${dir}/*.spec diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 99a3cdb2e4..efd5ab5e94 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -27,7 +27,7 @@ jobs: run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: CI Setup Script - if: !matrix.pkg.labels ["mock"] + if: ${{ !contains(matrix.pkg.labels, 'mock') }} run: | dir=$(dirname ${{ matrix.pkg.pkg }}) if [ -f $dir/ci_setup.rhai ]; then @@ -35,7 +35,7 @@ jobs: fi - name: Install Build Dependencies - if: !matrix.pkg.labels ["mock"] + if: ${{ !contains(matrix.pkg.labels, 'mock') }} run: | dir=$(dirname ${{ matrix.pkg.pkg }}) dnf5 builddep -y ${dir}/*.spec