Merge branch 'master' into feature/APPEALS-32376

.github/workflows/workflow.yml

@@ -234,6 +234,15 @@ jobs:
         with:
           path: ./tmp/capybara
 
+      - name: Rename examples.txt
+        if: success() || failure()
+        run: mv ./tmp/examples.txt ./tmp/examples-${{matrix.ci_node_index}}.txt
+      - uses: actions/upload-artifact@v3
+        if: success() || failure()
+        name: Upload tmp/examples.txt
+        with:
+          path: ./tmp/examples-${{matrix.ci_node_index}}.txt
+
       - name: Compress test logs
         if: failure()
         run: tar -czvf ./log/test-${{matrix.ci_node_index}}.log.tar.gz ./log/test.log
@@ -243,7 +252,9 @@ jobs:
         with:
           path: ./log/test-${{matrix.ci_node_index}}.log.tar.gz
 
-      - run: cp ./log/bullet.log ./log/bullet-${{matrix.ci_node_index}}.log
+      - name: Rename bullet.log
+        if: success() || failure()
+        run: mv ./log/bullet.log ./log/bullet-${{matrix.ci_node_index}}.log
       - uses: actions/upload-artifact@v3
         if: success() || failure()
         name: bullet-${{matrix.ci_node_index}}.log

spec/support/clear_cache.rb

@@ -18,7 +18,7 @@
   config.after(:each) do
     Rails.cache.clear
     REDIS_NAMESPACES.each { |namespace| delete_matched(namespace: namespace) }
-  rescue Errno::ENOENT, Errno::ENOTEMPTY => error
+  rescue Errno::ENOENT, Errno::ENOTEMPTY, Errno::EISDIR => error
     # flakey at CircleCI. Don't fail tests because of this.
     Rails.logger.error(error)
   end