From 5e0fe6d90a7fb700cd6b8cb6113b57abe10c1dcf Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sun, 12 Jan 2025 20:28:57 +0100 Subject: [PATCH] fixing CI --- .github/workflows/linux-build.yml | 3 +-- .github/workflows/macos-build.yml | 3 +-- .github/workflows/msys2-build.yml | 3 +-- .github/workflows/windows-build.yml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 7b2f3cf..220cfdf 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -19,7 +19,6 @@ jobs: matrix: os: [ubuntu-latest] arch: [x86_64] - kind: [shared, static] confs: - { mode: debug, archive: yes } - { mode: debug, config: --asan=y, archive: false, cache_key: -asan } @@ -74,7 +73,7 @@ jobs: # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} --static=${{ matrix.kind == 'static' && 'yes' || 'no' }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes + run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes # Save dependencies - name: Save cached xmake dependencies diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index cc4448d..a40fb57 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -18,7 +18,6 @@ jobs: matrix: os: [macOS-latest] arch: [x86_64] - kind: [shared, static] confs: - { mode: debug, archive: yes } - { mode: debug, config: --asan=y, archive: false, cache_key: -asan } @@ -67,7 +66,7 @@ jobs: # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} --static=${{ matrix.kind == 'static' && 'yes' || 'no' }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes + run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes # Save dependencies - name: Save cached xmake dependencies diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index 00defad..0297cc6 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -19,7 +19,6 @@ jobs: os: [windows-latest] arch: [x86_64] mode: [debug, release] - kind: [shared, static] runs-on: ${{ matrix.os }} if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} @@ -67,7 +66,7 @@ jobs: # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --static=${{ matrix.kind == 'static' && 'yes' || 'no' }} --ccache=n --unitybuild=y --yes + run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes # Save dependencies - name: Save cached xmake dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 395a621..237659d 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -18,7 +18,6 @@ jobs: os: [windows-latest] arch: [x64] mode: [debug, release] - kind: [shared, static] runs-on: ${{ matrix.os }} if: ${{ !contains(github.event.head_commit.message, 'ci skip') }} @@ -62,7 +61,7 @@ jobs: # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --static=${{ matrix.kind == 'static' && 'yes' || 'no' }} --ccache=n --unitybuild=y --yes + run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.confs.mode }} ${{ matrix.confs.config }} --ccache=n --unitybuild=y --yes # Save dependencies - name: Save cached xmake dependencies