revert CI

trailofbits · Feb 17, 2020 · e8940a4 · e8940a4
1 parent 6661dc4
commit e8940a4
Showing 1 changed file with 22 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,32 +66,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: docker without cache
-        run: |
-          docker build -t deepstate-base -f docker/base/Dockerfile docker/base
-          docker build -t deepstate --build-arg make_j=2 -f ./docker/Dockerfile .
-      # - uses: whoan/docker-build-with-cache-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKER_USERNAME }}
-      #     password: ${{ secrets.DOCKER_PASSWORD }}
-      #     registry: docker.pkg.github.com
-      #     image_name: trailofbits/deepstate/deepstate-base
-      #     image_tag: latest
-      #     context: docker/base
-      #     dockerfile: Dockerfile
-      #     push_image_and_stages: true  # because we run workflow on PRs
-      #     build_extra_args: "--tag deepstate-base"
-      # - uses: whoan/docker-build-with-cache-action@v3
-      #   with:
-      #     username: ${{ secrets.DOCKER_USERNAME }}
-      #     password: ${{ secrets.DOCKER_PASSWORD }}
-      #     registry: docker.pkg.github.com
-      #     image_name: trailofbits/deepstate/deepstate
-      #     image_tag: latest
-      #     context: .
-      #     dockerfile: docker/Dockerfile
-      #     push_image_and_stages: true  # because we run workflow on PRs
-      #     build_extra_args: "--cache-from=deepstate-base"
+      - uses: whoan/docker-build-with-cache-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: docker.pkg.github.com
+          image_name: trailofbits/deepstate/deepstate-base
+          image_tag: latest
+          context: docker/base
+          dockerfile: Dockerfile
+          push_image_and_stages: true  # because we run workflow on PRs
+          build_extra_args: "--tag deepstate-base"
+      - uses: whoan/docker-build-with-cache-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: docker.pkg.github.com
+          image_name: trailofbits/deepstate/deepstate
+          image_tag: latest
+          context: .
+          dockerfile: docker/Dockerfile
+          push_image_and_stages: true  # because we run workflow on PRs
+          build_extra_args: "--cache-from=deepstate-base --build-arg=make_j=2"
       - name: Test fuzzers
         run: |
           docker run -it deepstate bash -c 'sudo pip3 install nose && nosetests tests/test_fuzzers.py'