Skip to content

Commit

Permalink
Merge branch 'v2' into fix_early_disposing
Browse files Browse the repository at this point in the history
  • Loading branch information
victimsnino authored Oct 14, 2024
2 parents 5b98a3c + 5c43afd commit f62afa4
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions .github/workflows/ci v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,6 @@ jobs:
with:
fetch-depth: 0

# Work around https://github.com/actions/runner-images/issues/8659
# - name: "Remove GCC 13 from runner image (workaround)"
# if: matrix.config.os == 'ubuntu-latest'
# shell: bash
# run: |
# sudo apt-get update
# sudo apt-get purge -y g++-13 gcc-13 libstdc++-13-dev
# sudo apt-get install -y --allow-downgrades libstdc++-12-dev libstdc++6=12.* libgcc-s1=12.*

- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
cache: true

- name: get conan
uses: turtlebrowser/get-conan@main

Expand All @@ -64,6 +50,12 @@ jobs:
restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}
lookup-only: true

- name: Install Qt
if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule'
uses: jurplel/install-qt-action@v4
with:
cache: true

- name: conan detect profile
if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule'
run: |
Expand Down

0 comments on commit f62afa4

Please sign in to comment.