diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 5260ac9b..2186c2e7 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -10,15 +10,6 @@ on: jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: hadolint/hadolint-action@v3.1.0 - with: - recursive: true - ignore: DL3018 - build: runs-on: ubuntu-latest permissions: @@ -32,6 +23,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Run linter + uses: hadolint/hadolint-action@v3.1.0 + with: + recursive: true + ignore: DL3018 + # Workaround: https://github.com/docker/build-push-action/issues/461 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3.0.0 @@ -74,34 +71,3 @@ jobs: platforms: linux/amd64 #platforms: linux/amd64,linux/arm/v7,linux/arm/v6 no-cache: true - - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3.0.0 - - name: Start containers - run: | - sudo apt-get install -y docker-compose - docker-compose up --build --force-recreate --detach - - name: Run Tests - run: | - set -x - docker-compose ps - name=$(docker-compose ps | grep swtpm-test | awk '{print $1}') - rc=$(docker wait "${name}") - if [ "${rc}" != "0" ]; then - echo "test failed:" - docker logs "${name}" - exit 1 - fi - - - name: Logs - if: always() - run: docker-compose logs - - - name: Stop containers - if: always() - run: docker-compose down -