From d41fbeef269c0e39878976d67ca15bda07129a04 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Sat, 9 Mar 2024 20:25:15 +0100 Subject: [PATCH] Include RISCV64 in GHA job Signed-off-by: DL6ER --- .github/workflows/build.yml | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1966c7c1..4f04dbaf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: [[ $FAIL == 1 ]] && exit 1 || echo "Branch name depth check passed." shell: bash - gha-x86: + gha: runs-on: ubuntu-latest needs: smoke-tests strategy: @@ -61,6 +61,8 @@ jobs: bin_name: pihole-FTL-amd64 - platform: linux/386 bin_name: pihole-FTL-386 + - platform: linux/riscv64 + bin_name: pihole-FTL-riscv64 env: CI_ARCH: ${{ matrix.platform }} GIT_BRANCH: ${{ needs.smoke-tests.outputs.GIT_BRANCH }} @@ -86,34 +88,6 @@ jobs: SSH_USER: ${{ secrets.SSH_USER }} SSH_HOST: ${{ secrets.SSH_HOST }} - gha-riscv64: - runs-on: ubuntu-latest - needs: smoke-tests - env: - CI_ARCH: linux/riscv64 - GIT_BRANCH: ${{ needs.smoke-tests.outputs.GIT_BRANCH }} - GIT_TAG: ${{ needs.smoke-tests.outputs.GIT_TAG }} - steps: - - - name: Checkout code - uses: actions/checkout@v4.1.1 - - - name: Build and test and deploy FTL - uses: ./.github/actions/build-and-test - with: - platform: linux/riscv64 - bin_name: pihole-FTL-riscv64 - artifact_name: pihole-FTL-riscv64-binary - target_dir: ${{ needs.smoke-tests.outputs.OUTPUT_DIR }} - git_branch: ${{ needs.smoke-tests.outputs.GIT_BRANCH }} - git_tag: ${{ needs.smoke-tests.outputs.GIT_TAG }} - event_name: ${{ github.event_name }} - actor: ${{ github.actor }} - SSH_KEY: ${{ secrets.SSH_KEY }} - KNOWN_HOSTS: ${{ secrets.KNOWN_HOSTS }} - SSH_USER: ${{ secrets.SSH_USER }} - SSH_HOST: ${{ secrets.SSH_HOST }} - self-hosted: runs-on: self-hosted needs: smoke-tests