From 57e01f465fc08cb39685b40f9532f07778319ae3 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Sat, 13 Jan 2024 01:38:27 +0800 Subject: [PATCH] Workflow and .gitignore: Bug fix. --- .github/workflows/macos-static.yml | 6 +++--- .github/workflows/ubuntu-static.yml | 6 +++--- .github/workflows/windows-mingw-static.yml | 4 ++-- .github/workflows/windows-msvc-static.yml | 6 +++--- .gitignore | 4 ++++ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/macos-static.yml b/.github/workflows/macos-static.yml index e212e73..04ccd6c 100644 --- a/.github/workflows/macos-static.yml +++ b/.github/workflows/macos-static.yml @@ -6,14 +6,14 @@ on: - 'example/**' - 'lib_source/**' - 'scripts/**' - - '.github/workflows/macos-shared.yml' + - '.github/workflows/macos-static.yml' pull_request: paths: - '*.txt' - 'example/**' - 'lib_source/**' - 'scripts/**' - - '.github/workflows/macos-shared.yml' + - '.github/workflows/macos-static.yml' jobs: build: @@ -70,4 +70,4 @@ jobs: file: /Users/runner/work/RibbonUI/RibbonUI/build/example/${{ env.targetName }}.dmg asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.dmg tag: ${{ github.ref }} - overwrite: true \ No newline at end of file + overwrite: true diff --git a/.github/workflows/ubuntu-static.yml b/.github/workflows/ubuntu-static.yml index 6de459e..1f40ccf 100644 --- a/.github/workflows/ubuntu-static.yml +++ b/.github/workflows/ubuntu-static.yml @@ -7,14 +7,14 @@ on: - 'lib_source/**' - 'example/**' - 'scripts/**' - - '.github/workflows/ubuntu-shared.yml' + - '.github/workflows/ubuntu-static.yml' pull_request: paths: - '*.txt' - 'lib_source/**' - 'example/**' - 'scripts/**' - - '.github/workflows/ubuntu-shared.yml' + - '.github/workflows/ubuntu-static.yml' jobs: build: @@ -86,4 +86,4 @@ jobs: file: ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage tag: ${{ github.ref }} - overwrite: true \ No newline at end of file + overwrite: true diff --git a/.github/workflows/windows-mingw-static.yml b/.github/workflows/windows-mingw-static.yml index e453390..3d3feef 100644 --- a/.github/workflows/windows-mingw-static.yml +++ b/.github/workflows/windows-mingw-static.yml @@ -6,14 +6,14 @@ on: - 'lib_source/**' - 'example/**' - 'scripts/**' - - '.github/workflows/windows-mingw-shared.yml' + - '.github/workflows/windows-mingw-static.yml' pull_request: paths: - '*.txt' - 'example/**' - 'lib_source/**' - 'scripts/**' - - '.github/workflows/windows-mingw-shared.yml' + - '.github/workflows/windows-mingw-static.yml' jobs: build: diff --git a/.github/workflows/windows-msvc-static.yml b/.github/workflows/windows-msvc-static.yml index 5d50219..82650b2 100644 --- a/.github/workflows/windows-msvc-static.yml +++ b/.github/workflows/windows-msvc-static.yml @@ -6,14 +6,14 @@ on: - 'lib_source/**' - 'example/**' - 'scripts/**' - - '.github/workflows/windows-msvc-shared.yml' + - '.github/workflows/windows-msvc-static.yml' pull_request: paths: - '*.txt' - 'example/**' - 'lib_source/**' - 'scripts/**' - - '.github/workflows/windows-msvc-shared.yml' + - '.github/workflows/windows-msvc-static.yml' jobs: build: @@ -82,4 +82,4 @@ jobs: file: ${{ steps.package.outputs.packageName }}.zip asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}_static.zip tag: ${{ github.ref }} - overwrite: true \ No newline at end of file + overwrite: true diff --git a/.gitignore b/.gitignore index 1683b06..628225a 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,7 @@ Icon Network Trash Folder Temporary Items .apdisk + +# macOS +.DS_Store +*/.DS_Store