diff --git a/.github/workflows/linux-mingw.yml b/.github/workflows/linux-mingw.yml index 8d54fc2..ad47403 100644 --- a/.github/workflows/linux-mingw.yml +++ b/.github/workflows/linux-mingw.yml @@ -33,7 +33,7 @@ jobs: -v ${{ github.workspace }}:/sources -e NSIS_VERSION=${{ env.NSIS_VERSION }} -e TARGET_ARCH=${{ matrix.target_arch }} - -e COMPILER=${{ matrix.COMPILER }} + -e COMPILER=${{ matrix.compiler }} -e DOCKERIMG=${{ env.DOCKERIMG }} -e ARCH_ROOT_URL=${{ env.ARCH_ROOT_URL }} -e NJOBS=${{ env.NJOBS }} @@ -66,7 +66,7 @@ jobs: -v ${{ github.workspace }}:/sources -e NSIS_VERSION=${{ env.NSIS_VERSION }} -e TARGET_ARCH=${{ matrix.target_arch }} - -e COMPILER=${{ matrix.COMPILER }} + -e COMPILER=${{ matrix.compiler }} -e DOCKERIMG=${{ env.DOCKERIMG }} -e ARCH_ROOT_URL=${{ env.ARCH_ROOT_URL }} -e NJOBS=${{ env.NJOBS }} @@ -89,14 +89,14 @@ jobs: chmod +x ports/ci/linux-mingw/deploy.sh ./ports/ci/linux-mingw/deploy.sh - name: Release Upload - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v0.1.6 if: ${{ startsWith(github.ref, 'refs/tags/') }} with: files: packages/windows-gcc/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Daily Build Upload - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v0.1.6 if: ${{ !startsWith(github.ref, 'refs/tags/') }} with: body: "${{ github.event.head_commit.message }} (commit: ${{ github.sha }})" diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 864b8f0..818cf91 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -40,14 +40,14 @@ jobs: chmod +x ports/ci/mac/deploy.sh ./ports/ci/mac/deploy.sh - name: Release Upload - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v0.1.6 if: ${{ startsWith(github.ref, 'refs/tags/') }} with: files: packages/mac/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Daily Build Upload - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v0.1.6 if: ${{ !startsWith(github.ref, 'refs/tags/') }} with: body: "${{ github.event.head_commit.message }} (commit: ${{ github.sha }})" diff --git a/.github/workflows/windows-msys.yml b/.github/workflows/windows-msys.yml index ee44fd4..b8ce6e9 100644 --- a/.github/workflows/windows-msys.yml +++ b/.github/workflows/windows-msys.yml @@ -11,7 +11,6 @@ jobs: defaults: run: shell: msys2 {0} - steps: strategy: max-parallel: 10 fail-fast: false @@ -21,6 +20,7 @@ jobs: - compiler: clang env: COMPILER: ${{ matrix.compiler }} + steps: - uses: actions/checkout@v2 - uses: msys2/setup-msys2@v2 with: diff --git a/ports/ci/mac/build.sh b/ports/ci/mac/build.sh index 3f9d32b..14c248e 100644 --- a/ports/ci/mac/build.sh +++ b/ports/ci/mac/build.sh @@ -18,8 +18,14 @@ # # Web-Site: http://webcamoid.github.io/ -SOURCES_DIR=${PWD} -INSTALL_PREFIX=${SOURCES_DIR}/package-data +COMPILER_C=clang +COMPILER_CXX=clang++ + +if [ -z "${DISABLE_CCACHE}" ]; then + EXTRA_PARAMS="-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache" +fi + +INSTALL_PREFIX=${PWD}/package-data mkdir build cmake \ @@ -27,6 +33,8 @@ cmake \ -S . \ -B build \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" + -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DCMAKE_C_COMPILER="${COMPILER_C}" \ + -DCMAKE_CXX_COMPILER="${COMPILER_CXX}" cmake --build build --parallel ${NJOBS} cmake --build build --target install