From 92f11ab429dd3ad3fb948ffd00d47f23c40f5de0 Mon Sep 17 00:00:00 2001 From: cyan Date: Thu, 25 Jul 2024 00:44:46 +0000 Subject: [PATCH] disable docker runner on android +other updates --- .github/workflows/compat.yaml | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/compat.yaml b/.github/workflows/compat.yaml index 05f6142..b361b19 100644 --- a/.github/workflows/compat.yaml +++ b/.github/workflows/compat.yaml @@ -28,13 +28,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/x86_64-w64-mingw32 run: ./build_single.sh ${{ matrix.coin }} x86_64-w64-mingw32 -j$(nproc) @@ -63,8 +63,8 @@ jobs: matrix: coin: [monero, wownero] runs-on: ubuntu-latest - container: - image: debian:bookworm + # container: + # image: debian:bookworm steps: - name: Free Disk Space if: ${{ !startsWith(github.ref, 'refs/tags/v') }} @@ -79,8 +79,8 @@ jobs: swap-storage: true - name: Install dependencies run: | - apt update - apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo5 gperf unzip python-is-python3 + sudo apt update + sudo apt install -y build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo5 gperf unzip python-is-python3 - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -96,13 +96,14 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + !${{ matrix.coin }}/contrib/depends/built/*/android_ndk + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/x86_64-linux-android run: ./build_single.sh ${{ matrix.coin }} x86_64-linux-android -j$(nproc) @@ -155,13 +156,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/x86_64-linux-gnu run: ./build_single.sh ${{ matrix.coin }} x86_64-linux-gnu -j$(nproc) @@ -215,13 +216,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/aarch64-meego-linux-gnu run: | @@ -265,13 +266,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/aarch64-meego-linux-gnu run: | @@ -322,13 +323,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: ${{ matrix.coin }}/x86_64-apple-darwin11 run: ./build_single.sh ${{ matrix.coin }} x86_64-apple-darwin11 -j$(nproc) @@ -382,13 +383,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: build run: | @@ -441,13 +442,13 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ github.job }}-${{ matrix.coin }} - - name: Cache + - name: Cache built if: ${{ !startsWith(github.ref, 'refs/tags/v') }} uses: actions/cache@v4 with: path: | - ${{ matrix.coin }}/contrib/depends/sources - ${{ matrix.coin }}/contrib/depends/built + ${{ matrix.coin }}/contrib/depends/built/* + ${{ matrix.coin }}/contrib/depends/sources/* key: depends-${{ github.job }}-${{ matrix.coin }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }} - name: build run: |