From 96a35fd88b010d925fc186735ac82d67df42fa56 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Fri, 10 Jan 2020 11:41:39 +0000 Subject: [PATCH] CI: Run gen-workflows for snapcraft Signed-off-by: Daniel Silverstone --- .github/workflows/linux-builds-on-master.yaml | 17 ++++++++++++++ .github/workflows/linux-builds-on-pr.yaml | 15 +++++++++++++ .github/workflows/linux-builds-on-stable.yaml | 22 +++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/.github/workflows/linux-builds-on-master.yaml b/.github/workflows/linux-builds-on-master.yaml index 144ef031646..88223b32649 100644 --- a/.github/workflows/linux-builds-on-master.yaml +++ b/.github/workflows/linux-builds-on-master.yaml @@ -27,6 +27,11 @@ jobs: include: - target: x86_64-unknown-linux-gnu run_tests: YES + snap_arch: amd64 + - target: aarch64-unknown-linux-gnu # skip-pr + snap_arch: arm64 # skip-pr + - target: armv7-unknown-linux-gnueabihf + snap_arch: armhf steps: - uses: actions/checkout@v2 with: @@ -130,6 +135,18 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} if: github.event_name == 'push' && github.ref == 'refs/heads/stable' + - name: Build a snapcraft configuration file + run: | + sh ci/snapcraft.sh + if: matrix.snap_arch != '' + env: + DO_SNAP: 1 + SNAP_ARCH: ${{ matrix.snap_arch }} + SNAP_EDGE: 1 # skip-stable + - uses: jhenstridge/snapcraft-build-action@master + with: + path: snapcraft + if: matrix.snap_arch != '' - name: Clear the cargo caches run: | cargo install cargo-cache --no-default-features --features ci-autoclean diff --git a/.github/workflows/linux-builds-on-pr.yaml b/.github/workflows/linux-builds-on-pr.yaml index 4eb2ea0d376..74d7e3736bd 100644 --- a/.github/workflows/linux-builds-on-pr.yaml +++ b/.github/workflows/linux-builds-on-pr.yaml @@ -22,6 +22,9 @@ jobs: include: - target: x86_64-unknown-linux-gnu run_tests: YES + snap_arch: amd64 + - target: armv7-unknown-linux-gnueabihf + snap_arch: armhf steps: - uses: actions/checkout@v2 with: @@ -125,6 +128,18 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} if: github.event_name == 'push' && github.ref == 'refs/heads/stable' + - name: Build a snapcraft configuration file + run: | + sh ci/snapcraft.sh + if: matrix.snap_arch != '' + env: + DO_SNAP: 1 + SNAP_ARCH: ${{ matrix.snap_arch }} + SNAP_EDGE: 1 # skip-stable + - uses: jhenstridge/snapcraft-build-action@master + with: + path: snapcraft + if: matrix.snap_arch != '' - name: Clear the cargo caches run: | cargo install cargo-cache --no-default-features --features ci-autoclean diff --git a/.github/workflows/linux-builds-on-stable.yaml b/.github/workflows/linux-builds-on-stable.yaml index c3f360d258b..4c122bf0d2c 100644 --- a/.github/workflows/linux-builds-on-stable.yaml +++ b/.github/workflows/linux-builds-on-stable.yaml @@ -41,6 +41,17 @@ jobs: include: - target: x86_64-unknown-linux-gnu run_tests: YES + snap_arch: amd64 + - target: i686-unknown-linux-gnu # skip-pr skip-master + snap_arch: i386 # skip-pr skip-master + - target: aarch64-unknown-linux-gnu # skip-pr + snap_arch: arm64 # skip-pr + - target: armv7-unknown-linux-gnueabihf + snap_arch: armhf + - target: powerpc64le-unknown-linux-gnu # skip-pr skip-master + snap_arch: ppc64el # skip-pr skip-master + - target: s390x-unknown-linux-gnu # skip-pr skip-master + snap_arch: s390x # skip-pr skip-master steps: - uses: actions/checkout@v2 with: @@ -144,6 +155,17 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} if: github.event_name == 'push' && github.ref == 'refs/heads/stable' + - name: Build a snapcraft configuration file + run: | + sh ci/snapcraft.sh + if: matrix.snap_arch != '' + env: + DO_SNAP: 1 + SNAP_ARCH: ${{ matrix.snap_arch }} + - uses: jhenstridge/snapcraft-build-action@master + with: + path: snapcraft + if: matrix.snap_arch != '' - name: Clear the cargo caches run: | cargo install cargo-cache --no-default-features --features ci-autoclean