From d5bbcb9978621c592b030f4c275aeece8e6b52b2 Mon Sep 17 00:00:00 2001 From: Casper Date: Sun, 16 May 2021 20:46:55 +0200 Subject: [PATCH] CI fix for #1972 --- .github/workflows/test_merge_requests.yml | 24 +++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_merge_requests.yml b/.github/workflows/test_merge_requests.yml index 5223c6e3..34d0bca6 100644 --- a/.github/workflows/test_merge_requests.yml +++ b/.github/workflows/test_merge_requests.yml @@ -1,6 +1,7 @@ name: "Test Merge Requests" on: + workflow_dispatch: pull_request: paths: - 'target/**' @@ -23,7 +24,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1.3.0 id: buildx - - name: Build image locally + - name: Cache Docker layers + uses: actions/cache@v2.1.5 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Build images locally uses: docker/build-push-action@v2.4.0 with: builder: ${{ steps.buildx.outputs.name }} @@ -33,9 +41,21 @@ jobs: VCS_REF=${{ github.sha }} VCS_VER=${{ github.ref }} platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: false + tags: mailserver-testing:ci + cache-to: type=local,dest=/tmp/.buildx-cache + - name: Build image for test suit + uses: docker/build-push-action@v2.4.0 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + build-args: | + VCS_REF=${{ github.sha }} + VCS_VER=${{ github.ref }} + platforms: linux/amd64 load: true tags: mailserver-testing:ci + cache-from: type=local,src=/tmp/.buildx-cache - name: Run test suite run: > NAME=mailserver-testing:ci