diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8f9cd46a..b9d53d73 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,9 +21,7 @@ jobs: matrix: include: - TRIPLET: 'arm-android' - QT_ARCH: 'android_armv7' - TRIPLET: 'amd64-android' - QT_ARCH: 'android_arm64_v8a' runs-on: macos-12 env: @@ -48,7 +46,7 @@ jobs: - name: Prepare vars id: vars run: | - brew install automake bison flex gnu-sed autoconf-archive libtool gettext + brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja echo $(brew --prefix bison)/bin >> $GITHUB_PATH echo $(brew --prefix flex)/bin >> $GITHUB_PATH echo $(brew --prefix gettext)/bin >> $GITHUB_PATH @@ -85,10 +83,10 @@ jobs: setup-python: 'false' modules: 'qtsensors qtconnectivity qt5compat qtmultimedia qtpositioning qtshadertools' dir: ${{ github.workspace }} - target: ${{ matrix.QT_ARCH }} + target: android arch: ${{ matrix.qt_arch }} cache: true - cache-key-prefix: ${{ runner.os }}-QtCache-v2-${{ env.QT_VERSION }}-android + cache-key-prefix: ${{ runner.os }}-QtCache-v3-${{ env.QT_VERSION }}-android - name: Install Qt (desktop) uses: jurplel/install-qt-action@v3 @@ -99,7 +97,7 @@ jobs: dir: ${{ github.workspace }} target: desktop cache: true - cache-key-prefix: ${{ runner.os }}-QtCache-v2-${{ env.QT_VERSION }}-desktop + cache-key-prefix: ${{ runner.os }}-QtCache-v3-${{ env.QT_VERSION }}-desktop - name: Restore vcpkg folder id: cache-vcpkg-restore diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index a9326d4d..3120973d 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -38,7 +38,7 @@ jobs: - name: Prepare vars id: vars run: | - brew install automake bison flex gnu-sed autoconf-archive libtool gettext + brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja echo $(brew --prefix bison)/bin >> $GITHUB_PATH echo $(brew --prefix flex)/bin >> $GITHUB_PATH echo $(brew --prefix gettext)/bin >> $GITHUB_PATH diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3804e0d4..b14f39d9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -69,6 +69,7 @@ jobs: git remote add origin https://github.com/microsoft/vcpkg.git git pull origin master git checkout $VCPKG_BASELINE + ./bootstrap-vcpkg.sh - name: Build Deps diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 7fbe8230..7f79797a 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -37,7 +37,7 @@ jobs: - name: Prepare vars id: vars run: | - brew install automake bison flex gnu-sed autoconf-archive libtool gettext + brew install automake bison flex gnu-sed autoconf-archive libtool gettext cmake ninja echo $(brew --prefix bison)/bin >> $GITHUB_PATH echo $(brew --prefix flex)/bin >> $GITHUB_PATH echo $(brew --prefix gettext)/bin >> $GITHUB_PATH diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 2c729998..c8df1a78 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -79,8 +79,6 @@ jobs: run: | CALL "C:\Program Files (x86)\Microsoft Visual Studio\${{ env.VS_VERSION }}\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ env.CMAKE_ARCH }} - cd - - name: Build Deps shell: pwsh run: |