Merge pull request #2369 from sparklemotion/flavorjones-revert-buildx…

…-workaround ci: revert buildx workaround in image-building
sparklemotion · Nov 15, 2021 · 44efbc3 · 44efbc3
2 parents d2f839a + 2c10957
commit 44efbc3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -131,7 +131,7 @@ jobs:
       - uses: actions/checkout@v1 # v1 because of https://github.com/actions/checkout/issues/334
         with:
           submodules: true
-      # skip cache because of https://github.com/actions/checkout/issues/334
+      # skip cache because of https://github.com/actions/cache/issues/675
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test
@@ -149,7 +149,7 @@ jobs:
       - uses: actions/checkout@v1 # v1 because of https://github.com/actions/checkout/issues/334
         with:
           submodules: true
-      # skip cache because of https://github.com/actions/checkout/issues/334
+      # skip cache because of https://github.com/actions/cache/issues/675
       - run: bundle install --local || bundle install
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test:valgrind

diff --git a/.github/workflows/generate-ci-images.yml b/.github/workflows/generate-ci-images.yml
@@ -18,9 +18,6 @@ jobs:
           ruby-version: "3.0"
           bundler-cache: true
       - uses: docker/setup-buildx-action@v1
-        with: # see https://github.com/docker/buildx/issues/834
-          buildkitd-flags: --debug
-          driver-opts: image=moby/buildkit:v0.9.1
       - uses: docker/login-action@v1
         with:
           registry: ghcr.io

diff --git a/rakelib/docker.rake b/rakelib/docker.rake
@@ -66,9 +66,6 @@ module DockerHelper
                   ruby-version: "3.0"
                   bundler-cache: true
               - uses: docker/setup-buildx-action@v1
-                with: # see https://github.com/docker/buildx/issues/834
-                  buildkitd-flags: --debug
-                  driver-opts: image=moby/buildkit:v0.9.1
               - uses: docker/login-action@v1
                 with:
                   registry: ghcr.io